diff --git a/tests/integration/test_nlp_query_integration.py b/tests/integration/test_nlp_query_integration.py
index 073e89d2..83e56ac4 100644
--- a/tests/integration/test_nlp_query_integration.py
+++ b/tests/integration/test_nlp_query_integration.py
@@ -124,7 +124,7 @@ class TestNLPQueryServiceIntegration:
         phase2_response = PromptResponse(
             text=json.dumps({
                 "query": expected_graphql.strip(),
-                "variables": {"min_total": 500.0},
+                "variables": {"min_total": "500.0"},
                 "confidence": 0.92
             }),
             error=None
@@ -153,7 +153,7 @@ class TestNLPQueryServiceIntegration:
         assert "California" in response.graphql_query
         assert response.detected_schemas == ["customers", "orders"]
         assert response.confidence == 0.92
-        assert response.variables["min_total"] == 500.0
+        assert response.variables["min_total"] == "500.0"
 
     @pytest.mark.asyncio
     async def test_complex_multi_table_query_integration(self, integration_processor):
@@ -444,7 +444,7 @@ class TestNLPQueryServiceIntegration:
             msg.properties.return_value = {"id": f"concurrent-test-{i}"}
             
             flow = MagicMock()
-            flow_response = MagicMock()
+            flow_response = AsyncMock()
             flow.return_value = flow_response
             
             requests.append(request)
diff --git a/tests/unit/test_retrieval/test_nlp_query.py b/tests/unit/test_retrieval/test_nlp_query.py
index edfeab1c..c783c8f0 100644
--- a/tests/unit/test_retrieval/test_nlp_query.py
+++ b/tests/unit/test_retrieval/test_nlp_query.py
@@ -162,7 +162,7 @@ class TestNLPQueryProcessor:
         
         consumer = MagicMock()
         flow = MagicMock()
-        flow_response = MagicMock()
+        flow_response = AsyncMock()
         flow.return_value = flow_response
         
         # Mock Phase 1 response
@@ -217,7 +217,7 @@ class TestNLPQueryProcessor:
         
         consumer = MagicMock()
         flow = MagicMock()
-        flow_response = MagicMock()
+        flow_response = AsyncMock()
         flow.return_value = flow_response
         
         # Mock Phase 1 error