Clean up tests
Merge pull request #11 from jayfo/tests

Resolve #6 and Resolve #10