Revert "refactored connection, improve specs"

This reverts commit 13bd941d23500682a8a6c615bb2c4f0d776d347c.
more test coverage