Fixed broken tests
Merge pull request #267 from stefk/test-fix

Fixed broken tests