Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rf760ffc4b10556e5186e9ceb90294262063440ca -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f760ffc4b10556e5186e9ceb90294262063440ca)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1)
@@ -72,6 +72,7 @@
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
     stopSyringePump();
+    setCurrentSubState( (U32)currentConsumableSelfTestState );
 
     // Set valves to default positions
     setValveAirTrap( STATE_CLOSED );
@@ -158,6 +159,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