diff --git a/tests/production/test_complete_system_integration.py b/tests/production/test_complete_system_integration.py
index fec981b7..88f78b6d 100644
--- a/tests/production/test_complete_system_integration.py
+++ b/tests/production/test_complete_system_integration.py
@@ -33,20 +33,27 @@ class TestCompleteSystemIntegration:
         # Test system directory structure through service status
         health = response.json()
         assert health["status"] == "healthy"
-        assert "services" in health
+        assert "service" in health
         
         # Test CLI system architecture commands
-        system_status = health["services"]
-        assert isinstance(system_status, dict)
+        service_info = health["service"]
+        assert isinstance(service_info, str)
         
         # Test repository cleanup - clean API structure
         endpoints = [
-            "/health", "/agents/discover", "/tasks/submit", 
-            "/load-balancer/strategy", "/advanced-features/status"
+            "/health", "/agents/discover", "/metrics/summary", 
+            "/system/status", "/advanced-features/status"
         ]
         
         for endpoint in endpoints:
-            response = requests.get(f"{self.BASE_URL}{endpoint}")
+            if endpoint == "/agents/discover":
+                # POST endpoint for agent discovery
+                response = requests.post(f"{self.BASE_URL}{endpoint}", 
+                    json={"status": "active", "capabilities": ["compute"]},
+                    headers={"Content-Type": "application/json"})
+            else:
+                # GET endpoint for others
+                response = requests.get(f"{self.BASE_URL}{endpoint}")
             # Should not return 404 for core endpoints
             assert response.status_code != 404
     
@@ -57,14 +64,13 @@ class TestCompleteSystemIntegration:
         assert response.status_code == 200
         
         health = response.json()
-        services = health["services"]
+        service_name = health["service"]
         
         # Test service consolidation
-        assert "agent_coordinator" in services
-        assert services["agent_coordinator"] == "running"
+        assert service_name == "agent-coordinator"
         
         # Test environment file consolidation through consistent responses
-        response = requests.get(f"{self.BASE_URL}/metrics/health")
+        response = requests.get(f"{self.BASE_URL}/metrics/summary")
         assert response.status_code == 200
         health_metrics = response.json()
         assert health_metrics["status"] == "success"
@@ -101,7 +107,7 @@ class TestCompleteSystemIntegration:
             "agent_type": "worker",
             "capabilities": ["compute", "storage", "ai_processing"],
             "services": ["task_processing", "learning"],
-            "endpoints": ["http://localhost:8001"],
+            "endpoints": {"api": "http://localhost:8001/api", "status": "http://localhost:8001/status"},
             "metadata": {"version": "1.0.0", "capabilities_version": "2.0"}
         }
         
@@ -121,7 +127,7 @@ class TestCompleteSystemIntegration:
         assert response.status_code == 200
         discovery = response.json()
         assert "agents" in discovery
-        assert "total" in discovery
+        assert "count" in discovery
         
         # Test advanced AI/ML integration
         token = self.get_admin_token()
@@ -244,8 +250,11 @@ class TestCompleteSystemIntegration:
         # (This tests the test infrastructure itself)
         test_data = {
             "agent_id": "test_suite_agent",
-            "agent_type": "test",
-            "capabilities": ["testing"]
+            "agent_type": "worker",
+            "capabilities": ["testing"],
+            "services": ["test_service"],
+            "endpoints": {"api": "http://localhost:8001/api"},
+            "metadata": {"version": "1.0.0"}
         }
         
         response = requests.post(
@@ -321,8 +330,8 @@ class TestCompleteSystemIntegration:
         
         # Test API key management
         response = requests.post(
-            f"{self.BASE_URL}/auth/api-key/generate",
-            json={"user_id": "integration_user", "permissions": ["agent:view"]},
+            f"{self.BASE_URL}/auth/api-key/generate?user_id=integration_user",
+            json=["agent:view"],
             headers={
                 "Authorization": f"Bearer {token}",
                 "Content-Type": "application/json"
@@ -334,8 +343,7 @@ class TestCompleteSystemIntegration:
         
         # Test user management
         response = requests.post(
-            f"{self.BASE_URL}/users/integration_user/role",
-            json={"role": "operator"},
+            f"{self.BASE_URL}/users/integration_user/role?role=operator",
             headers={
                 "Authorization": f"Bearer {token}",
                 "Content-Type": "application/json"
@@ -361,13 +369,15 @@ class TestCompleteSystemIntegration:
         assert "performance" in metrics
         assert "system" in metrics
         
-        # Test health metrics
-        response = requests.get(f"{self.BASE_URL}/metrics/health")
+        # Test health metrics - use system status instead
+        response = requests.get(
+            f"{self.BASE_URL}/system/status",
+            headers={"Authorization": f"Bearer {token}"}
+        )
         assert response.status_code == 200
         health = response.json()
-        assert "health" in health
-        assert "memory" in health["health"]
-        assert "cpu" in health["health"]
+        assert "overall" in health
+        assert health["overall"] == "healthy"
         
         # Test alerting system
         response = requests.get(
@@ -464,7 +474,7 @@ class TestCompleteSystemIntegration:
         health = response.json()
         assert isinstance(health["status"], str)
         assert isinstance(health["timestamp"], str)
-        assert isinstance(health["services"], dict)
+        assert isinstance(health["service"], str)
         
         # Test error response types
         response = requests.get(f"{self.BASE_URL}/nonexistent")