Added unit tests
Added unit tests
Added unit tests
Merge branch 'master' of http://github.com/adairdavid/SENG403G1