Fix tests
Merge pull request #16 from dieterdemeyer/master

Fix tests