diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0f71566d05][OT2_P20S_None_2_7_Walkthrough].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0f71566d05][OT2_P20S_None_2_7_Walkthrough].json
index d1786c8ca62..3d18e932a56 100644
--- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0f71566d05][OT2_P20S_None_2_7_Walkthrough].json
+++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[0f71566d05][OT2_P20S_None_2_7_Walkthrough].json
@@ -3293,7 +3293,7 @@
       "errorInfo": {
         "args": "()",
         "class": "AssertionError",
-        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 503, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
+        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 512, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
       },
       "errorType": "PythonException",
       "wrappedErrors": []
diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[20cefcac62][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[20cefcac62][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json
index d1aaa472fe9..ef9f55e77e7 100644
--- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[20cefcac62][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json
+++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[20cefcac62][OT2_P300M_P20S_TC_HS_TM_2_13_SmokeTestV3].json
@@ -11889,7 +11889,7 @@
       "errorInfo": {
         "args": "()",
         "class": "AssertionError",
-        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 503, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
+        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 512, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
       },
       "errorType": "PythonException",
       "wrappedErrors": []
diff --git a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8df082e960][OT2_P300MLeft_MM_TM_2_4_Zymo].json b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8df082e960][OT2_P300MLeft_MM_TM_2_4_Zymo].json
index 0ccb1065979..d27e70c456f 100644
--- a/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8df082e960][OT2_P300MLeft_MM_TM_2_4_Zymo].json
+++ b/app-testing/tests/__snapshots__/analyses_snapshot_test/test_analysis_snapshot[8df082e960][OT2_P300MLeft_MM_TM_2_4_Zymo].json
@@ -10913,7 +10913,7 @@
       "errorInfo": {
         "args": "()",
         "class": "AssertionError",
-        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 503, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
+        "traceback": "  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/protocol_engine.py\", line 512, in finish\n    await exit_stack.aclose()\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 656, in aclose\n    await self.__aexit__(None, None, None)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 714, in __aexit__\n    raise exc_details[1]\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 697, in __aexit__\n    cb_suppress = await cb(*exc_details)\n\n  File \"/usr/local/lib/python3.10/contextlib.py\", line 608, in _exit_wrapper\n    await callback(*args, **kwds)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 102, in stop\n    await p.teardown()\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 112, in teardown\n    await self._action_dispatching_task\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_runner/legacy_context_plugin.py\", line 160, in _dispatch_all_actions\n    self.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/plugins.py\", line 37, in dispatch\n    return self._action_dispatcher.dispatch(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/actions/action_dispatcher.py\", line 30, in dispatch\n    self._sink.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/state.py\", line 209, in handle_action\n    substore.handle_action(action)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/commands.py\", line 261, in handle_action\n    self._state.command_history.set_command_running(running_command)\n\n  File \"/usr/local/lib/python3.10/site-packages/opentrons/protocol_engine/state/command_history.py\", line 175, in set_command_running\n    assert self.get_running_command() is None\n"
       },
       "errorType": "PythonException",
       "wrappedErrors": []