Better tests
Merge pull request #3 from mrjoelkemp/better_tests

Better tests