Added more unit tests, fixed some existing ones.
Merge branch 'dev' of https://github.com/stevenhillcox/Grad-Project-2014 into dev