Fixes and stability imrovements for integration tests
fix unittests
Merge pull request #25 from vasichkin/integration-tests-fixes

Integration tests fixes