Added some more tests
Merge pull request #67 from Callum-/master

Added some more tests