Updated test cases to match new structure. Changed a few naming
inconsistencies I missed in freshdata on last commit