Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc7ea3969643ead419cbfcd34c3cb203c45bcad71 -r6ebbc7eb52b9b6fa0ef128e86e7a4be29971ad4c
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c7ea3969643ead419cbfcd34c3cb203c45bcad71)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 6ebbc7eb52b9b6fa0ef128e86e7a4be29971ad4c)
@@ -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.
@@ -614,6 +614,9 @@
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_40_ML_PER_MIN );
             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 ); // TODO uncomment
+
             // State transition
             concentrateTestStartTime = getMSTimerCount();
             result                   = DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY;
@@ -680,6 +683,10 @@
             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 );
+
+            // Set back the conductivity of CD2 calibration table to the normal calibration table
+            setCondcutivitySensorCalTable( CONDUCTIVITYSENSORS_CD2_SENSOR, CAL_DATA_CD2_COND_SENSOR );
+
             // State transition
             concentrateTestStartTime = getMSTimerCount();
             result                   = DG_FILL_MODE_STATE_TEST_ACID_CONDUCTIVITY;