more tests
Merge pull request #37 from Empeeric/more-tests

more tests