added tests, few changes to move
Merge branch 'master' of https://github.com/aidendeom/soen387-a2