Moved common database setup functions to helper class
Removed unused code
Added test for a non-repeat and non-record show Added a helper class