Added more tests
Merge pull request #4 from geraintpalmer/master

Added more tests