Fix tests
Merge pull request #1 from bantic/fix-tests

Fix tests