Add tests
Merge pull request #2 from Southern/tests

Add tests