TestClient Fixed