Cleanup to common
Added new test that covers multiple connections