Fix tests
Merge pull request #269 from pokap/master

Fix tests