Add tests
Simplify tests
Merge pull request #2 from treyhunner/tests

Add tests