diff --git a/g-code-testing/g_code_parsing/g_code_engine.py b/g-code-testing/g_code_parsing/g_code_engine.py
index 06aed89b099..a1443b85f5d 100644
--- a/g-code-testing/g_code_parsing/g_code_engine.py
+++ b/g-code-testing/g_code_parsing/g_code_engine.py
@@ -15,7 +15,7 @@
 from opentrons.config.robot_configs import build_config
 from opentrons.hardware_control.emulation.module_server.helpers import (
     wait_emulators,
-    ModuleServerClient,
+    ModuleStatusClient,
 )
 from opentrons.hardware_control.emulation.scripts import run_app
 from opentrons.hardware_control import API, ThreadManager
@@ -76,7 +76,7 @@ def _run_app():
 
         # Entry point for process that waits for emulation to be ready.
         async def _wait_ready() -> None:
-            c = await ModuleServerClient.connect(
+            c = await ModuleStatusClient.connect(
                 host="localhost", port=self._config.module_server.port
             )
             await wait_emulators(client=c, modules=modules, timeout=5)
diff --git a/g-code-testing/g_code_test_data/http/http_settings.py b/g-code-testing/g_code_test_data/http/http_settings.py
index 787f265b4e0..15e5008d0d4 100644
--- a/g-code-testing/g_code_test_data/http/http_settings.py
+++ b/g-code-testing/g_code_test_data/http/http_settings.py
@@ -1,9 +1,11 @@
-from opentrons.hardware_control.emulation.settings import Settings, SmoothieSettings
+from opentrons.hardware_control.emulation.settings import (
+    Settings, SmoothieSettings, PipetteSettings
+)
 
 
 HTTP_SETTINGS = Settings(
     smoothie=SmoothieSettings(
-        left={"model": "p20_single_v2.0", "id": "P20SV202020070101"},
-        right={"model": "p300_single_v2.1", "id": "P20SV202020070101"}
+        left=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"),
+        right=PipetteSettings(model="p300_single_v2.1", id="P20SV202020070101")
     )
 )
diff --git a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py
index 3b889b2c164..bd55e48dcbd 100644
--- a/g-code-testing/g_code_test_data/protocol/protocol_configurations.py
+++ b/g-code-testing/g_code_test_data/protocol/protocol_configurations.py
@@ -1,4 +1,4 @@
-from opentrons.hardware_control.emulation.settings import Settings, SmoothieSettings
+from opentrons.hardware_control.emulation.settings import Settings, SmoothieSettings, PipetteSettings
 from g_code_test_data.g_code_configuration import ProtocolGCodeConfirmConfig
 import pytest
 
@@ -8,8 +8,8 @@
 
 SWIFT_SMOOTHIE_SETTINGS = Settings(
     smoothie=SmoothieSettings(
-        left={"model": "p20_single_v2.0", "id": "P20SV202020070101"},
-        right={"model": "p300_multi_v2.1", "id": "P20SV202020070101"},
+        left=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"),
+        right=PipetteSettings(model="p300_multi_v2.1", id="P20SV202020070101"),
     )
 )
 
@@ -22,8 +22,8 @@
     path="protocol/protocols/smoothie_protocol.py",
     settings=Settings(
         smoothie=SmoothieSettings(
-            left={"model": "p20_single_v2.0", "id": "P20SV202020070101"},
-            right={"model": "p20_single_v2.0", "id": "P20SV202020070101"},
+            left=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"),
+            right=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"),
         )
     )
 )
@@ -33,8 +33,8 @@
     path="protocol/protocols/2_single_channel_v2.py",
     settings=Settings(
         smoothie=SmoothieSettings(
-            left={"model": "p20_single_v2.0", "id": "P20SV202020070101"},
-            right={"model": "p300_single_v2.1", "id": "P20SV202020070101"},
+            left=PipetteSettings(model="p20_single_v2.0", id="P20SV202020070101"),
+            right=PipetteSettings(model="p300_single_v2.1", id="P20SV202020070101"),
         )
     )
 )
@@ -44,8 +44,8 @@
     path="protocol/protocols/2_modules_1s_1m_v2.py",
     settings=Settings(
         smoothie=SmoothieSettings(
-            left={"model": "p300_single_v2.1", "id": "P20SV202020070101"},
-            right={"model": "p20_multi_v2.1", "id": "P20SV202020070101"},
+            left=PipetteSettings(model="p300_single_v2.1", id="P20SV202020070101"),
+            right=PipetteSettings(model="p20_multi_v2.1", id="P20SV202020070101"),
         )
     )
 )