Fixing failed tests
Merge pull request #4 from tstrachota/fixes

Fixing failed tests