tests
Merge pull request #193 from ChrisBeaumont/cleanup

new tests