Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r8afac005a36a62d8d36e58a4c46d0225b3367204 -rded8100d1dc9e08ae171026f9e434587700c1bce
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 8afac005a36a62d8d36e58a4c46d0225b3367204)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision ded8100d1dc9e08ae171026f9e434587700c1bce)
@@ -7,8 +7,8 @@
 *
 * @file    ConsumableSelfTest.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      02-Feb-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      15-May-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
@@ -72,6 +72,7 @@
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
     stopSyringePump();
+    setCurrentSubState( (U32)currentConsumableSelfTestState );
 
     // Set valves to default positions
     setValveAirTrap( STATE_CLOSED );
@@ -159,6 +160,7 @@
 
     if ( priorSubState != currentConsumableSelfTestState )
     {
+        setCurrentSubState( (U32)currentConsumableSelfTestState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentConsumableSelfTestState );
     }
     // Handle triggered alarm with stop property