Use TestClient instead of per-test code