Improve stability
Merge pull request #26 from vasichkin/integration-tests-fixes

Improve stability