diff --git a/pilot/helpers/agents/test_CodeMonkey.py b/pilot/helpers/agents/test_CodeMonkey.py
index d802837..7a0bc62 100644
--- a/pilot/helpers/agents/test_CodeMonkey.py
+++ b/pilot/helpers/agents/test_CodeMonkey.py
@@ -41,7 +41,7 @@ class TestCodeMonkey:
         self.codeMonkey = CodeMonkey(self.project, developer=self.developer)
 
     @patch('helpers.AgentConvo.get_saved_development_step', return_value=None)
-    @patch('helpers.AgentConvo.save_development_step', new_callable=MagicMock)
+    @patch('helpers.AgentConvo.save_development_step')
     @patch('os.get_terminal_size', mock_terminal_size)
     @patch.object(File, 'insert')
     def test_implement_code_changes(self, mock_get_dev, mock_save_dev, mock_file_insert):
@@ -78,8 +78,8 @@ class TestCodeMonkey:
                 assert (called_data['path'] == '/' or called_data['path'] == called_data['name'])
                 assert called_data['content'] == 'Washington'
 
-    @patch('helpers.AgentConvo.get_saved_development_step', return_value=None)
-    @patch('helpers.AgentConvo.save_development_step', new_callable=MagicMock)
+    @patch('helpers.AgentConvo.get_saved_development_step')
+    @patch('helpers.AgentConvo.save_development_step')
     @patch('os.get_terminal_size', mock_terminal_size)
     @patch.object(File, 'insert')
     def test_implement_code_changes_with_read(self, mock_get_dev, mock_save_dev, mock_file_insert):
diff --git a/pilot/helpers/agents/test_Developer.py b/pilot/helpers/agents/test_Developer.py
index 0a8eeba..cd2e46e 100644
--- a/pilot/helpers/agents/test_Developer.py
+++ b/pilot/helpers/agents/test_Developer.py
@@ -2,7 +2,7 @@ import builtins
 import json
 import os
 import pytest
-from unittest.mock import patch, MagicMock
+from unittest.mock import patch
 
 import requests
 
@@ -59,7 +59,6 @@ class TestDeveloper:
     @patch('helpers.AgentConvo.save_development_step')
     # GET_TEST_TYPE has optional properties, so we need to be able to handle missing args.
     @patch('helpers.AgentConvo.create_gpt_chat_completion',
-           new_callable = MagicMock,
            return_value={'text': '{"type": "command_test", "command": {"command": "npm run test", "timeout": 3000}}'})
     # 2nd arg of return_value: `None` to debug, 'DONE' if successful
     @patch('helpers.cli.execute_command', return_value=('stdout:\n```\n\n```', 'DONE'))
@@ -86,7 +85,7 @@ class TestDeveloper:
     # GET_TEST_TYPE has optional properties, so we need to be able to handle missing args.
     @patch('helpers.AgentConvo.create_gpt_chat_completion',
            return_value={'text': '{"type": "manual_test", "manual_test_description": "Does it look good?"}'})
-    @patch('helpers.Project.ask_user', return_value='continue', new_callable=MagicMock)
+    @patch('helpers.Project.ask_user', return_value='continue')
     def test_code_changes_manual_test_continue(self, mock_get_saved_step, mock_save, mock_chat_completion, mock_ask_user):
         # Given
         monkey = None
@@ -101,7 +100,7 @@ class TestDeveloper:
 
     @patch('helpers.AgentConvo.get_saved_development_step')
     @patch('helpers.AgentConvo.save_development_step')
-    @patch('helpers.AgentConvo.create_gpt_chat_completion', new_callable=MagicMock)
+    @patch('helpers.AgentConvo.create_gpt_chat_completion')
     @patch('utils.questionary.get_saved_user_input')
     # https://github.com/Pythagora-io/gpt-pilot/issues/35
     def test_code_changes_manual_test_no(self, mock_get_saved_user_input, mock_chat_completion, mock_save, mock_get_saved_step):