tests
Merge pull request #12 from ehemsley/testing

tests