Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r75e1ae332d1446dddf9b8d4ce6e8317449c57d67 -rcd5be724d5a3ba7457e761191d82f278654d7f5c
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 75e1ae332d1446dddf9b8d4ce6e8317449c57d67)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision cd5be724d5a3ba7457e761191d82f278654d7f5c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ConsumableSelfTest.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      19-Jan-2023
+* @date    (last)      01-Jun-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
@@ -72,6 +72,7 @@
     signalDialInPumpHardStop();
     signalDialOutPumpHardStop();
     stopSyringePump();
+    setCurrentSubState( (U32)CONSUMABLE_SELF_TESTS_INSTALL_STATE );
 
     // 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