Add more tests
Merge pull request #55 from djv/patch-2

Add more tests