fixes failing test-cases
Merge pull request #343 from UFOMelkor/test-fixes

fixes failing test-cases