Refactor ConnectionTest
Add connection tests