Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6d392942d8e7286a4748398a2359b7bd519f870a -r9a17263d3224e90efe850ba0501f48e7669cb323
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6d392942d8e7286a4748398a2359b7bd519f870a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9a17263d3224e90efe850ba0501f48e7669cb323)
@@ -7,8 +7,8 @@
 *
 * @file    SelfTests.c
 *
-* @author  (last)      Sean Nash
-* @date    (last)      13-Jul-2022
+* @author  (last)      Bill Bracken
+* @date    (last)      22-Aug-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  28-Jan-2021
@@ -41,7 +41,7 @@
 
 #define PUMP_RUN_SELF_TEST_TIME_MS                          ( 15 * MS_PER_SECOND )                  ///< Self-test time to run pumps in ms.
 #define PUMP_SELF_TEST_FLOW_RATE_ML_MIN                     100                                     ///< Self-test pump flow rate in mL/min.
-#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 3 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
+#define SYRINGE_PUMP_OCCLUSION_CHECK_DELAY                  ( 1 * MS_PER_SECOND )                   ///< Delay 3 seconds then check for syringe pump prime occlusion.
 
 #define BLOOD_PUMP_RUN_TIME_PRESSURE_SELF_TEST              ( 5 * MS_PER_SECOND )                   ///< Pressure self-test time to run blood pump in ms.
 #define NORMALIZED_PRESSURE_SELF_TEST_TIME                  ( 4 * MS_PER_SECOND )                   ///< Time to wait for pressure to normalize in ms.
@@ -232,14 +232,14 @@
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) )
     {
-        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+        useHeparin = FALSE;
     }
     else
 #endif
     {
-        useHeparin = FALSE;
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
     }
 
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
@@ -340,7 +340,7 @@
         }
         else
         {
-            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
+//            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, currentNoCartSelfTestsState );
         }
     }
 }
@@ -403,8 +403,6 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
-
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -489,11 +487,6 @@
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
 
-    if ( SELF_TEST_STATUS_FAILED == result )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, currentDrySelfTestsState );
-    }
-
     // Publish current self-test time data
     if ( calcTimeSince( selfTestPreviousPublishDataTime ) >= SELF_TEST_TIME_DATA_PUB_INTERVAL )
     {
@@ -572,8 +565,6 @@
  *************************************************************************/
 void execWetSelfTests( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_PASSED;
-
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
     {
@@ -643,11 +634,6 @@
 
     // Self-tests flags should be handled by now, reset if flags not handled with current state
     resetSelfTestsFlags();
-
-    if ( SELF_TEST_STATUS_FAILED == result )
-    {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, currentWetSelfTestsState );
-    }
 }
 
 /*********************************************************************//**
@@ -746,7 +732,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePumpStopped() )
+        if ( ( isSyringePumpHome() != TRUE ) && ( TRUE == isSyringePumpStopped() ) )
         {
             retractSyringePump();
         }
@@ -921,10 +907,10 @@
     {
         state = DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE;
     }
-    else
-    {
-        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
-    }
+//    else
+//    {
+//        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+//    }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
     {
@@ -1161,8 +1147,8 @@
             {
                 if ( TRUE == isSyringePumpPrimed() )
                 {
+                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 1 second has elapsed
                     state = DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE;
-                    syringeOcclusionDelayStartTime = getMSTimerCount();   // Get the current time to check for occlusion after 3 seconds has elapsed
                 }
                 else
                 {
@@ -1175,6 +1161,10 @@
                 {
                     seekSyringePlunger();
                 }
+                else
+                {
+                    retractSyringePump();
+                }
             }
         }
     }
@@ -1391,7 +1381,6 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-
     if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
 #ifndef _RELEASE_
@@ -1735,8 +1724,11 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     if ( TRUE == selfTestsResumeRequested )
     {
+        doorClosedRequired( TRUE, TRUE );
         selfTestsResumeRequested = FALSE;
         state = WET_SELF_TESTS_START_STATE;
     }