Fixed all test failures
Merge branch 'master' of ssh://git@github.com/COMP-3350-Group-6/Project.git