Fix tests
Merge pull request #82 from vasichkin/master

Fix tests