Fixed tests in question
Merge branch 'master' of https://github.com/danpalmer/COMP6017