Add tests.
Merge pull request #7 from cunningt/addtests

Addtests