Add some tests
Merge pull request #1 from derekpitt/feature/tests

Added some tests