fixed/added unit tests
Merge branch 'master' of https://github.com/michboon/comp2014