Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -raa4db7d76566ad7473f896e543f71fdbbc921ea9 -rd37f31cff6c20085953ecb598558e4d91e42f0af
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision aa4db7d76566ad7473f896e543f71fdbbc921ea9)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d37f31cff6c20085953ecb598558e4d91e42f0af)
@@ -59,7 +59,7 @@
 #define WET_SELF_TEST_FIRST_DISPLACEMENT_TARGET_VOLUME_ML   100.0                                   ///< Target of first displacement volume in ml.
 #define WET_SELF_TEST_SECOND_DISPLACEMENT_TARGET_VOLUME_ML  600.0                                   ///< Target of second displacement volume in ml.
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           5.0                                     ///< Tolerance on integrated volume in percentage.
-#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              12.0                                    ///< Tolerance in the load cell readings of the displacement in grams (2%).
+#define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              25.0                                    ///< Tolerance in the load cell readings of the displacement in grams (2%).
 #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.
 
@@ -235,11 +235,15 @@
     F32 const bolusVol = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
     F32 const hepRate = getTreatmentParameterF32( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
 
-#ifndef DISABLE_SYRINGE_PUMP
-    useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
-#else
-    useHeparin = FALSE;
-#endif
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        useHeparin = ( ( bolusVol > 0.0 ) || ( hepRate > 0.0 ) ? TRUE : FALSE );
+    }
+    else
+    {
+        useHeparin = FALSE;
+    }
+
     currentNoCartSelfTestsState = NO_CART_SELF_TESTS_START_STATE;
     runPumpStartTime = 0;
     havePumpsStarted = FALSE;
@@ -281,7 +285,7 @@
             break;
 
         case NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE:
-            execDialInFlowTest();
+            // TODO as of now, the dialysate flow self test only gets the calibration record so it is only called in POST
             currentNoCartSelfTestsState = NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE;
             break;
 
@@ -338,7 +342,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 );
         }
     }
 }
@@ -392,16 +396,15 @@
     switch ( currentDrySelfTestsState )
     {
         case DRY_SELF_TESTS_START_STATE:
-            // 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 ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
             {
-                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed.
-#ifdef SKIP_DRY_SELF_TESTS
                 // TODO: Remove once dry self-test is ready to use
                 currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#else
+            }
+            else
+            {
                 currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#endif
             }
             break;
 
@@ -854,10 +857,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() )
     {
@@ -1078,11 +1081,15 @@
     if ( TRUE == selfTestsResumeRequested )
     {
         selfTestsResumeRequested = FALSE;
-#ifndef SKIP_DRY_SELF_TESTS
-        state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#else
-        state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
-#endif
+
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            state = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+        }
+        else
+        {
+            state = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+        }
     }
 
     return state;
@@ -1222,11 +1229,18 @@
 
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
-#ifndef SKIP_AIR_BUBBLE_CHECK
-    if ( ( BUBBLE_NOT_DETECTED == ADABubbleStatus ) && ( BUBBLE_NOT_DETECTED == ADVBubbleStatus ) )
-#endif
+
+    if ( BUBBLE_NOT_DETECTED == ADVBubbleStatus )
     {
-        zeroBloodLeak();
+#ifndef _RELEASE_
+        // TODO do we need both of these?
+        if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) &&
+             ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SELF_TESTS_AIR_BUBBLE_CHECK ) != SW_CONFIG_ENABLE_VALUE ) )
+#endif
+        {
+            zeroBloodLeak();
+        }
+
         state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
         *result = SELF_TEST_STATUS_PASSED;
     }
@@ -1252,7 +1266,10 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
-    if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+#ifndef IGNORE_BLOOD_LEAK_SELF_TEST
+    if ( /*( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) || */
+         ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) )
+#endif
     {
         settleStartTime = getMSTimerCount();
         state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;