Simplified connection tests a bit.