Added tests for usecases 10, 12, 14
Merged conflicts and added test cases
Merge branch 'master' of https://github.com/CMPUT301W14T02/Comput301Project