Adds tests
Merge pull request #2 from nickschuch/tests

Adds tests