modified TestClient