fixed failing tests
Merge pull request #184 from gulbinas/fix-some-tests

fixed failing tests