Add tests
Merge pull request #2 from ackintosh/test

Add tests