Fixes + enhanced tests
Further connection tests