Minor rest test clean up
Merge branch 'master' of https://github.com/awwong1/CMPUT410-Project