Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rb8ce96efa5d03ef863ca828c4491327e7a467f17 -r9f4c7b3eb733b5de7b1667d1b1f43ff3c1ca8b21
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision b8ce96efa5d03ef863ca828c4491327e7a467f17)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9f4c7b3eb733b5de7b1667d1b1f43ff3c1ca8b21)
@@ -494,6 +494,7 @@
 {
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_PRIME_CONCENTRATE_LINES;
 
+#ifndef DISABLE_PRIME_CONCENT_LINES
     if ( TRUE == didTimeout( concentratePrimingStartTime, PRIME_CONCENTRATE_LINES_TIME_OUT_MS ) )
     {
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
@@ -503,9 +504,10 @@
         pumpSpeedIndex = 0;
         setROPumpTargetFlowRateLPM( roPumpFlushBubblesSpeed[ pumpSpeedIndex ] / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
         flushBubblesStartTime = getMSTimerCount();
+    }
+#endif
         // State transition
         result = DG_FILL_MODE_STATE_FLUSH_BUBBLES;
-    }
 
     return result;
 }
@@ -564,6 +566,7 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY;
     F32 bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 
+#ifndef DISABLE_BICARB_CONDUCTIVITY_TEST
     totalBicarbConductivity += bicarbConductivity;
     bicarbConductivitySampleCount++;
 
@@ -582,20 +585,26 @@
             pctDiffInConductivity       = 0.0;
             bicarbConductivitySampleCount = 0;
             acidConductivitySampleCount   = 0;
+#endif
+            requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
+
             // Set pumps flow rate to prepare for acid conductivity testing
             setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_20_ML_PER_MIN );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
             // State transition
             concentrateTestStartTime  = getMSTimerCount();
             result = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY;
+
+#ifndef DISABLE_BICARB_CONDUCTIVITY_TEST
         }
         else
         {
             SET_ALARM_WITH_1_F32_DATA( ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, averageBicarbConductivity );
             requestNewOperationMode( DG_MODE_GENE );
         }
     }
+#endif
 
     return result;
 }
@@ -616,6 +625,7 @@
     F32 acidConductivity   = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
     F32 bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 
+#ifndef DISABLE_ACID_CONDUCTIVITY_TEST
     totalBicarbConductivity += bicarbConductivity;
     bicarbConductivitySampleCount++;
 
@@ -632,11 +642,14 @@
              ( TRUE == isValueWithinPercentRange(averageAcidConductivity, ACID_TEST_CD2_TCD, FIVE_PERCENT_FACTOR) )   &&
              ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) )
         {
+#endif
             // Do the necessary setup here before transition to Produce Dialysate State
             fillStatus.isThisFirstFill = FALSE;
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
             setROPumpTargetFlowRateLPM( getTargetFillFlowRateLPM(), TARGET_RO_PRESSURE_PSI );
             result = DG_FILL_MODE_STATE_PRODUCE_DIALYSATE;
+
+#ifndef DISABLE_ACID_CONDUCTIVITY_TEST
         }
         else
         {
@@ -645,6 +658,8 @@
         }
     }
 
+#endif
+
     return result;
 }