fixed tests that refactoring broke
Merge branch 'master' of https://github.com/nhandler/cs429