Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rce64b7e15824641a6a6465c28eec5d8ec593f110 -r35a326b0f9f2fd83bac4be54e67ebde2d3f2c7e1
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision ce64b7e15824641a6a6465c28eec5d8ec593f110)
+++ 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 );
@@ -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
     handleConsumableSelfTestStopRequest();