Fixed tests
Merge pull request #245 from AntonShevchuk/master

Fixed tests