Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r3d72b777cf1ceb673d118341c46e2d6d5b7b75f5 -r9c970f6c10aaa43eed47bf94d51e789427b34cca
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3d72b777cf1ceb673d118341c46e2d6d5b7b75f5)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 9c970f6c10aaa43eed47bf94d51e789427b34cca)
@@ -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;
 
@@ -395,13 +399,15 @@
             // 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 ) )
             {
-                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
-                currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
-#endif
+                setOcclusionInstallLevel();  // Record occlusion pressure level after a new cartridge is installed
+                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DRY_SELF_TESTS ) )
+                {
+                    currentDrySelfTestsState = DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE;
+                }
+                else
+                {
+                    currentDrySelfTestsState = DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE;
+                }
             }
             break;
 
@@ -845,7 +851,6 @@
 static DRY_SELF_TESTS_STATE_T handleDrySelfTestUsedCartridgeCheckState( void )
 {
     DRY_SELF_TESTS_STATE_T state = DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE;
-
     BUBBLE_STATUS_T const ADVBubbleStatus = getBubbleStatus( ADV );
 
     if ( ( BUBBLE_DETECTED == ADVBubbleStatus ) &&
@@ -1078,11 +1083,14 @@
     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 +1230,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 +1267,8 @@
 {
     WET_SELF_TESTS_STATE_T state = WET_SELF_TESTS_BLOOD_LEAK_DETECTOR_STATE;
 
-    if ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() )
+    if ( ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_BLOOD_LEAK_SELF_TEST ) != SW_CONFIG_ENABLE_VALUE ) ||
+         ( SELF_TEST_STATUS_PASSED == getBloodLeakSelfTestStatus() ) )
     {
         settleStartTime = getMSTimerCount();
         state = WET_SELF_TESTS_FIRST_DISPLACEMENT_SETUP_STATE;