Merge pull request #25 from vasichkin/integration-tests-fixes

Integration tests fixes
Improve stability