Merge pull request #37 from chrispitt/add-some-tests

Add some tests
Going with the safer option.
Going with the safer option.