Adding more tests
Merge pull request #50 from conorfennell/master

Adding more tests