diff --git a/simulator_tests/conversation_base_test.py b/simulator_tests/conversation_base_test.py
index f66df25..54a13cc 100644
--- a/simulator_tests/conversation_base_test.py
+++ b/simulator_tests/conversation_base_test.py
@@ -24,8 +24,12 @@ EXAMPLE:
 
             # Step 2: Continue with codereview tool - memory is preserved!
             result2, _ = self.call_mcp_tool_direct("codereview", {
-                "files": ["/path/to/file.py"],
-                "prompt": "Focus on security issues",
+                "step": "Focus on security issues in this code",
+                "step_number": 1,
+                "total_steps": 1,
+                "next_step_required": False,
+                "findings": "Starting security-focused code review",
+                "relevant_files": ["/path/to/file.py"],
                 "continuation_id": continuation_id
             })
 """
diff --git a/simulator_tests/test_content_validation.py b/simulator_tests/test_content_validation.py
index 88ece79..10467a1 100644
--- a/simulator_tests/test_content_validation.py
+++ b/simulator_tests/test_content_validation.py
@@ -104,8 +104,12 @@ DATABASE_CONFIG = {
             response3, _ = self.call_mcp_tool(
                 "codereview",
                 {
-                    "files": [validation_file],
-                    "prompt": "Review this configuration file",
+                    "step": "Review this configuration file for quality and potential issues",
+                    "step_number": 1,
+                    "total_steps": 1,
+                    "next_step_required": False,
+                    "findings": "Starting code review of configuration file",
+                    "relevant_files": [validation_file],
                     "model": "flash",
                 },
             )
diff --git a/simulator_tests/test_openrouter_fallback.py b/simulator_tests/test_openrouter_fallback.py
index 4802171..91fc058 100644
--- a/simulator_tests/test_openrouter_fallback.py
+++ b/simulator_tests/test_openrouter_fallback.py
@@ -82,8 +82,12 @@ class OpenRouterFallbackTest(BaseSimulatorTest):
             response2, _ = self.call_mcp_tool(
                 "codereview",
                 {
-                    "files": [test_file],
-                    "prompt": "Quick review of this sum function",
+                    "step": "Quick review of this sum function for quality and potential issues",
+                    "step_number": 1,
+                    "total_steps": 1,
+                    "next_step_required": False,
+                    "findings": "Starting code review of sum function",
+                    "relevant_files": [test_file],
                     "model": "flash",
                     "temperature": 0.1,
                 },
@@ -101,8 +105,12 @@ class OpenRouterFallbackTest(BaseSimulatorTest):
             response3, _ = self.call_mcp_tool(
                 "analyze",
                 {
-                    "files": [self.test_files["python"]],
-                    "prompt": "Analyze the structure of this Python code",
+                    "step": "Analyze the structure of this Python code",
+                    "step_number": 1,
+                    "total_steps": 1,
+                    "next_step_required": False,
+                    "findings": "Starting code structure analysis",
+                    "relevant_files": [self.test_files["python"]],
                     "model": "pro",
                     "temperature": 0.1,
                 },
@@ -120,7 +128,11 @@ class OpenRouterFallbackTest(BaseSimulatorTest):
             response4, _ = self.call_mcp_tool(
                 "debug",
                 {
-                    "prompt": "Why might a function return None instead of a value?",
+                    "step": "Why might a function return None instead of a value?",
+                    "step_number": 1,
+                    "total_steps": 1,
+                    "next_step_required": False,
+                    "findings": "Starting debug investigation of None return values",
                     "model": "flash",  # Should map to OpenRouter
                     "temperature": 0.1,
                 },