Add retry to TestClient