Adopted tests for refactoring of connection logic
Stable version 1.1.0