Added several test cases
Merge branch 'master' of https://github.com/tpolasek/cmput410-project