Made TestClient and TestServer constructors more clear.