Updated test cases to match new structure. Changed a few naming
inconsistencies I missed in freshdata on last commit
Merge pull request #2 from dmeyer3691/master

Updated test cases