Add tests
Merge pull request #7 from necolas/feature/tests

Add tests