Add tests
Merge pull request #1 from stidges/feature-tests

Add tests