Add tests
Merge pull request #2 from then/features/tests

Add tests