fix tests after merge
more tests
Merge pull request #55 from felixb/fix-tests

fix tests after merge