Add tests
Merge pull request #2 from mmun/add-tests

Add tests