adds plenty o' tests
Merge pull request #2 from hughrawlinson/master

adds plenty o' tests