Fixed more tests
Merge pull request #368 from pachalad/master

Fixed more tests