Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc4f3105da2ed8a7c40950588b54b79067185a3ad -rd4f40c48a728c866c24bf44a59ff8ddd1e244ca1
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c4f3105da2ed8a7c40950588b54b79067185a3ad)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision d4f40c48a728c866c24bf44a59ff8ddd1e244ca1)
@@ -78,7 +78,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
@@ -615,7 +615,7 @@
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
             // Prior to collecting data for bicarb test, change the CD2 calibration table
-            setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST );
+            // setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR_FILL_BICARB_TEST ); // TODO uncomment
 
             // State transition
             concentrateTestStartTime = getMSTimerCount();
@@ -670,7 +670,7 @@
         }
 #endif
 
-        if ( ( TRUE == isConductivityInRange ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) ) )
+        if ( ( TRUE == isConductivityInRange ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) ) )
         {
             // Initialization
             requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB, NO_PARK_CONC_PUMPS );
@@ -746,7 +746,7 @@
 #endif
         {
             if ( ( TRUE == isValueWithinPercentRange( averageAcidConductivity, acidCondUSPerCM, FIVE_PERCENT_FACTOR ) ) ||
-                 ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) ) )
+                 ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) ) )
             {
                 hasAcidTestPassed = TRUE;
             }
@@ -755,7 +755,7 @@
                 SET_ALARM_WITH_1_F32_DATA( ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE, averageAcidConductivity )
             }
 
-            if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) ) )
+            if ( ( pctDiffInConductivity < FIVE_PERCENT_FACTOR ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) ) )
             {
                 hasCD1CD2TestPassed = TRUE;
             }
@@ -941,7 +941,7 @@
                 F32 avgCPo = sumFillCPoConductivity / (F32)fillCPoConductivitySampleCnt;  // sample count incremented above w/o condition so no need for divide by zero checks
                 F32 avgRR  = sumFillRejRatio / (F32)fillCPoConductivitySampleCnt;
 
-                if ( ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW ) && ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != FALSE ) )
+                if ( ( avgCPo > MAX_CPO_CONDUCTIVITY_ALLOW ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
                 {
                     // Fault alarm per PRS 483
                     SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_OUTLET_PRIMARY_CONDUCTIVITY_OUT_OF_RANGE, avgCPo, MAX_CPO_CONDUCTIVITY_ALLOW );
@@ -972,7 +972,7 @@
         {
             // SRSDG 400
             if ( ( FALSE == isValueWithinPercentRange( avgBicarbConductivity, bicarbNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != TRUE ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );
@@ -982,7 +982,7 @@
             }
 
             if ( ( FALSE == isValueWithinPercentRange( avgAcidConductivity, acidNormalConductivity, FIVE_PERCENT_FACTOR ) ) &&
-                 ( getTestConfigStatus( TEST_CONFIG_ENABLE_MIXING_WITH_WATER ) != TRUE ) )
+                 ( getTargetFillVolumeML() > MIN_FILL_TARGET_TO_CHECK_RO_AND_CPO_ML ) && ( getTestConfigStatus( TEST_CONFIG_MIX_WITH_WATER ) != TRUE ) )
             {
                 setBadAvgConductivityDetectedFlag( TRUE );          // signal idle bad avg conductivity detected
                 setThisFisrtFillFlag( TRUE );