Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rcd057da54a204e4577ed217a8325314f7e21dde1 -r80a6638b362f5f613c0665200023d181f614d1bc
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision cd057da54a204e4577ed217a8325314f7e21dde1)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 80a6638b362f5f613c0665200023d181f614d1bc)
@@ -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,7 +403,6 @@
  *************************************************************************/
 void execDrySelfTests( void )
 {
-
     // execute dry self-tests state machine
     switch ( currentDrySelfTestsState )
     {
@@ -566,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 )
     {
@@ -637,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 );
-    }
 }
 
 /*********************************************************************//**
@@ -740,7 +732,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePumpStopped() )
+        if ( ( isSyringePumpHome() != TRUE ) && ( TRUE == isSyringePumpStopped() ) )
         {
             retractSyringePump();
         }
@@ -915,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() )
     {
@@ -1171,8 +1163,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
                 {
@@ -1185,6 +1177,10 @@
                 {
                     seekSyringePlunger();
                 }
+                else
+                {
+                    retractSyringePump();
+                }
             }
         }
     }
@@ -1401,7 +1397,6 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-
     if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
 #ifndef _RELEASE_
@@ -1539,8 +1534,8 @@
  * @brief
  * The handleWetSelfTestFirstDisplacementVerifyState function checks the load cell
  * readings and FMD integrated volume after the first dialysate displacement.
- * @details Inputs: settleStartTime, reservoirVolume[], reservoirs' weights
- * @details Outputs: verify correctness of dialysate flow meter and load cell
+ * @details Inputs: settleStartTime, fmdIntegratedVolume
+ * @details Outputs: none
  * @return the next state of wet self-tests state machine
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestFirstDisplacementVerifyState( void )
@@ -1737,16 +1732,19 @@
  * @brief
  * The handleWetSelfTestStoppedState function handles the stopped wet self-tests
  * operation.
- * @details Inputs: none
- * @details Outputs: none
+ * @details Inputs: selfTestsResumeRequested
+ * @details Outputs: selfTestsResumeRequested
  * @return the next state of wet self-tests state machine
  *************************************************************************/
 static WET_SELF_TESTS_STATE_T handleWetSelfTestStoppedState( void )
 {
     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;
     }