remove ConnectionForTest and timeouts