Updated test cases

Updated test cases to match new class structure. This revealed some minor changes that needed to be made to freshdata as well (mostly moving code and renaming)