Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r8e0f53b8ba1373df06b7f2e07daa22d1ef494b20 -r7c94ce646c60b4052d9d6c8d212cfa1096bfece9
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 8e0f53b8ba1373df06b7f2e07daa22d1ef494b20)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 7c94ce646c60b4052d9d6c8d212cfa1096bfece9)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-Jan-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      30-Jan-2023
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -47,7 +47,7 @@
 #define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 1 second then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 30 * MS_PER_SECOND )                  ///< Pressure self-test time to run blood pump in ms.
-#define VENOUS_PRESSURE_SELF_TEST_MAX_TEST_TIME             ( 30 * MS_PER_SECOND )                  ///< Pressure self-test time to run venous self test in ms.
+#define VENOUS_PRESSURE_SELF_TEST_MAX_TEST_TIME             ( 60 * MS_PER_SECOND )                  ///< Pressure self-test time to run venous self test in ms.
 #define DECAY_PRESSURE_SELF_TEST_TIME                       ( 4 * MS_PER_SECOND )                   ///< time to wait for pressure to decay in ms.
 #define STABILTY_PRESSURE_SELF_TEST_TIME                    ( 5 * MS_PER_SECOND )                   ///< Time to wait for pressure to stabilize in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 20 * MS_PER_SECOND )                  ///< Time to wait for pressure to normalize in ms.
@@ -114,6 +114,7 @@
 static F32 reservoirVolume[ NUM_OF_DG_RESERVOIRS ];                 ///< Hold the current volume of all reservoirs.
 static BOOL isValvesSettingSent;                                    ///< Flag indicates valve setting change has been send to DG.
 
+static U32 selfTestCartridgeSettleTime;                             ///< Cartridge settle start time.
 static U32 selfTestStartTime;                                       ///< Starting time of self-test (in ms).
 static U32 selfTestPreviousPublishDataTime;                         ///< Last time self-test time data is being published (in ms).
 static U32 syringeOcclusionDelayStartTime;                          ///< Used to calculate the 1 second delay time before check for prime occlusion.
@@ -289,6 +290,8 @@
  *************************************************************************/
 void execNoCartSelfTests( void )
 {
+    NO_CART_SELF_TESTS_STATE_T priorSubState = currentNoCartSelfTestsState;
+
     // execute no cartridge self-tests state machine
     switch ( currentNoCartSelfTestsState )
     {
@@ -336,6 +339,10 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
+    if ( priorSubState != currentNoCartSelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentNoCartSelfTestsState );
+    }
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -388,7 +395,7 @@
     previousNormalVenousPressure = 0.0;
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
-
+    selfTestCartridgeSettleTime = getMSTimerCount();
     doorClosedRequired( FALSE, TRUE );
 
     // Pumps should be off
@@ -416,6 +423,8 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
+    DRY_SELF_TESTS_STATE_T priorSubState = currentDrySelfTestsState;
+
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -498,6 +507,10 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
+    if ( priorSubState != currentDrySelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentDrySelfTestsState );
+    }
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -576,6 +589,8 @@
  *************************************************************************/
 void execWetSelfTests( void )
 {
+    WET_SELF_TESTS_STATE_T priorSubState = currentWetSelfTestsState;
+
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
     {
@@ -645,6 +660,11 @@
 
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
+
+    if ( priorSubState != currentWetSelfTestsState )
+    {
+        SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentWetSelfTestsState );
+    }
 }
 
 /*********************************************************************//**
@@ -892,19 +912,19 @@
     if ( STATE_CLOSED == pumpTrack )
     {
         // Ensure occlusion sensor has time to settle after cartridge insertion before starting dry self-tests
-        if ( TRUE == didTimeout( selfTestStartTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
+        if ( TRUE == didTimeout( selfTestCartridgeSettleTime, CARTRIDGE_INSERT_PRESSURE_SETTLE_TIME_MS ) )
         {
             setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
             doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
             if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
-                currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+                state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
             }
             else
 #endif
             {
-                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+                state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
             }
         }
     }
@@ -1147,6 +1167,7 @@
 
     if ( TRUE == didTimeout( pressureSelfTestVenousTestStartTime, VENOUS_PRESSURE_SELF_TEST_MAX_TEST_TIME ) )
     {
+        setAirPumpState( AIR_PUMP_STATE_OFF );
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, venousPressure, VENOUS_PRESSURE_SELF_TEST_HIGH_LIMIT_MMHG );
     }
 
@@ -1488,6 +1509,7 @@
         // Restart self-test start time
         selfTestStartTime = getMSTimerCount();
         selfTestsResumeRequested = FALSE;
+        selfTestCartridgeSettleTime = getMSTimerCount();
 
 #ifndef _RELEASE_
         if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )