Fix tests
Merge pull request #27 from ducksmanager/master

Fix tests