Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b -r7e9a0ee7e8f64336235f11a84726871777747f8c
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 7e9a0ee7e8f64336235f11a84726871777747f8c)
@@ -83,7 +83,6 @@
 static const U32 BP_MAX_ROTOR_SPEED_ERROR_PERSIST = ((1 * MS_PER_SECOND) / TASK_PRIORITY_INTERVAL);
 
 #define BP_MAX_CURR_WHEN_STOPPED_MA         150.0           ///< Motor controller current should not exceed this when pump should be stopped
-#define BP_MIN_CURR_WHEN_RUNNING_MA         150.0           ///< Motor controller current should always exceed this when pump should be running
 #define BP_MAX_CURR_WHEN_RUNNING_MA         2000.0          ///< Motor controller current should not exceed this when pump should be running
 #define BP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm
 
@@ -1220,7 +1219,7 @@
     else
     {
         bpCurr = fabs( getMeasuredBloodPumpMCCurrent() );
-        if ( ( bpCurr < BP_MIN_CURR_WHEN_RUNNING_MA ) || ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA ) )
+        if ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA )
         {
             bpCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( bpCurrErrorDurationCtr > BP_MAX_CURR_ERROR_DURATION_MS )
@@ -1280,6 +1279,7 @@
     // Retrieve blood flow sensor calibration data and check for sensor connected status
 #ifndef SKIP_CALIBRATION_TESTS
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
+#endif
     {
         bloodFlowCalGain = cal.bloodFlowGain;
         bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b -r7e9a0ee7e8f64336235f11a84726871777747f8c
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 7e9a0ee7e8f64336235f11a84726871777747f8c)
@@ -80,7 +80,6 @@
 
 
 #define DIP_MAX_CURR_WHEN_STOPPED_MA         150.0           ///< Motor controller current should not exceed this when pump should be stopped.
-#define DIP_MIN_CURR_WHEN_RUNNING_MA         150.0           ///< Motor controller current should always exceed this when pump should be running.
 #define DIP_MAX_CURR_WHEN_RUNNING_MA         2000.0          ///< Motor controller current should not exceed this when pump should be running.
 #define DIP_MAX_CURR_ERROR_DURATION_MS       2000            ///< Motor controller current errors persisting beyond this duration will trigger an alarm.
 
@@ -1172,7 +1171,7 @@
     else
     {
         dipCurr = fabs( getMeasuredDialInPumpMCCurrent() );
-        if ( ( dipCurr < DIP_MIN_CURR_WHEN_RUNNING_MA ) || ( dipCurr > DIP_MAX_CURR_WHEN_RUNNING_MA ) )
+        if ( dipCurr > DIP_MAX_CURR_WHEN_RUNNING_MA )
         {
             dipCurrErrorDurationCtr += TASK_PRIORITY_INTERVAL;
             if ( dipCurrErrorDurationCtr > DIP_MAX_CURR_ERROR_DURATION_MS )
@@ -1232,6 +1231,7 @@
 #ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
+#endif
     {
         dialInFlowCalGain = cal.dialysateFlowGain;
         dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;
Index: firmware/App/HDCommon.h
===================================================================
diff -u -r85a680de4306aa033b1dc1f386fa5fa0a25cf73b -r7e9a0ee7e8f64336235f11a84726871777747f8c
--- firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 85a680de4306aa033b1dc1f386fa5fa0a25cf73b)
+++ firmware/App/HDCommon.h	(.../HDCommon.h)	(revision 7e9a0ee7e8f64336235f11a84726871777747f8c)
@@ -57,10 +57,15 @@
 //    #define READ_FPGA_ASYNC_DATA            1           // Test build reads non-priority register page every other time
 //    #define EMC_TEST_BUILD                  1           // EMC test build - HD/DG run separately but connected, HD pumps toggle on/off w/ stop button
     #define ALARMS_DEBUG                    1           // Triggered alarms sent to debug UART
-    #define SKIP_SELF_TESTS                 1           // Skip Pre-treatment Self-tests
     #define SKIP_PRIMING                    1           // Skip Pre-treatment Prime
+    #define SKIP_WET_SELF_TESTS             1           // Skip Pre-treatment prime wet self-tests
     #define SKIP_CALIBRATION_TESTS          1           // Skip calibration tests
 //    #define V1_5_SYSTEM                     1           // Build for v1.5 system
+    #define SKIP_SAMPLE_WATER               1           // Skip pre-treatment sample water
+    #define SKIP_CONSUMABLE_TESTS           1           // Skip pre-treatment consumable Self-tests
+    #define SKIP_CALIBRATION_TESTS          1           // Skip pre-treatment self-tests involving calibration
+    #define SKIP_DRY_SELF_TESTS             1           // Skip pre-treatment dry self-tests
+    #define SKIP_UI_INTERACTION             1           // Skip UI interaction.
 
     #include <stdio.h>
     #include <strings.h>