Finished adding tests
Merge branch 'master' of https://github.com/bob81pizza/assignment2