Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r980fb60527374cf842362e17affba1bef09c6919 -rb1f086e7cd292d5a97a7265075400274d60d4fbf
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 980fb60527374cf842362e17affba1bef09c6919)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision b1f086e7cd292d5a97a7265075400274d60d4fbf)
@@ -58,8 +58,9 @@
 #define WET_SELF_TEST_RESERVOIR_ONE_SETUP_VOLUME_ML         1200.0F                                 ///< Setup volume for reservoir one before wet self-test in ml.
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0F                                  ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0F                                  ///< Target of second displacement volume in ml.
-#define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           15.0F                                   ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              60.0F                                   ///< Tolerance in the load cell readings of the displacement in grams (2%).
+#define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.05F                                   ///< Tolerance on integrated volume as a percentage (5%).
+#define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           20.0F                                   ///< Tolerance on integrated volume in grams.
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              20.0F                                   ///< Tolerance in the load cell readings of the displacement in grams.
 #define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
 #define RESERVOIR_SETTLE_TIME_MS                            ( 4 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
@@ -233,6 +234,8 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
@@ -359,6 +362,8 @@
     selfTestStartTime = getMSTimerCount();
     selfTestPreviousPublishDataTime = getMSTimerCount();
 
+    doorClosedRequired( TRUE, TRUE );
+
     // Pumps should be off
     signalBloodPumpHardStop();
     signalDialInPumpHardStop();
@@ -539,8 +544,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 )
     {
@@ -610,11 +613,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 );
-    }
 }
 
 /*********************************************************************//**
@@ -660,14 +658,6 @@
     signalDialOutPumpHardStop();
     selfTestStartTime = getMSTimerCount();
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-    {
-        frontDoor = STATE_CLOSED;
-        pumpTrack = STATE_CLOSED;
-    }
-#endif
-
     // TODO: Use appropriate sensor driver
     if ( ( STATE_CLOSED == frontDoor ) && ( STATE_CLOSED == pumpTrack ) )
     {
@@ -723,7 +713,7 @@
 
     if ( TRUE == useHeparin )
     {
-        if ( TRUE == isSyringePumpStopped() )
+        if ( ( isSyringePumpHome() != TRUE ) && ( TRUE == isSyringePumpStopped() ) )
         {
             retractSyringePump();
         }
@@ -824,13 +814,16 @@
 {
     NO_CART_SELF_TESTS_STATE_T state = NO_CART_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
         havePumpsStarted = FALSE;
+        doorClosedRequired( TRUE, TRUE );
         state = NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
     }
 
@@ -854,14 +847,6 @@
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
-#ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_SWITCHES_MONITOR ) )
-    {
-        frontDoor = STATE_CLOSED;
-        pumpTrack = STATE_CLOSED;
-    }
-#endif
-
     // TODO: Use appropriate sensor driver
     if (( STATE_CLOSED == frontDoor ) && (STATE_CLOSED == pumpTrack ) )
     {
@@ -1120,13 +1105,15 @@
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_STOPPED_STATE;
 
+    doorClosedRequired( FALSE, FALSE );
+
     // Restart self-test start time
     selfTestStartTime = getMSTimerCount();
 
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-
+        doorClosedRequired( TRUE, TRUE );
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
         {
@@ -1425,10 +1412,12 @@
         F32 resOneDiffAfterDisplacement     = reservoirVolume[ DG_RESERVOIR_1 ] - getReservoirWeightLargeFilter( DG_RESERVOIR_1 );
         F32 resTwoDiffAfterDisplacement     = getReservoirWeightLargeFilter( DG_RESERVOIR_2 ) - reservoirVolume[ DG_RESERVOIR_2 ];
         F32 averageDisp                     = ( resOneDiffAfterDisplacement + resTwoDiffAfterDisplacement ) / 2.0;
+        F32 integratedVolumeDiff            = fabs( fmdIntegratedVolume - averageDisp );
         F32 integratedVolumeToTargetPercent = fabs( 1.0 - ( fmdIntegratedVolume / averageDisp ) );
 
         if ( ( fabs( resOneDiffAfterDisplacement - resTwoDiffAfterDisplacement) <= WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G ) &&
-             ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) )
+             ( ( integratedVolumeDiff <= WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE ) ||
+               ( integratedVolumeToTargetPercent <= WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE ) ) )
         {
             state = WET_SELF_TESTS_SECOND_DISPLACEMENT_SETUP_STATE;
         }