Fix broken tests that were somehow wiped out in merging different branches
Merge branch 'master' of github.com:coldstar96/cse403