Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rf9c0896317f27b4fe62fc51c3938b242a40d69ce -r8747e947a7bc52dc3a4fb1346935740e08f5e974
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision f9c0896317f27b4fe62fc51c3938b242a40d69ce)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8747e947a7bc52dc3a4fb1346935740e08f5e974)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      15-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -295,7 +295,7 @@
     pumpHomingRequestedForNCST = FALSE;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
-
+    setCurrentSubState( (U32)currentNoCartSelfTestsState );
     doorClosedRequired( TRUE, TRUE );
 
     // Pumps should be off
@@ -371,6 +371,7 @@
 
     if ( priorSubState != currentNoCartSelfTestsState )
     {
+        setCurrentSubState( (U32)currentNoCartSelfTestsState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentNoCartSelfTestsState );
     }
     // Publish current self-test time data
@@ -428,7 +429,7 @@
     selfTestPreviousPublishDataTime = getMSTimerCount();
     selfTestCartridgeSettleTime = getMSTimerCount();
     doorClosedRequired( FALSE, TRUE );
-
+    setCurrentSubState( (U32)currentDrySelfTestsState );
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
@@ -532,6 +533,7 @@
 
     if ( priorSubState != currentDrySelfTestsState )
     {
+        setCurrentSubState( (U32)currentDrySelfTestsState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrySelfTestsState );
     }
     // Publish current self-test time data