Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc7ea3969643ead419cbfcd34c3cb203c45bcad71 -rfd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c7ea3969643ead419cbfcd34c3cb203c45bcad71)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision fd89ed3ac616c0ee40e3ffc357d379cb2f4aa12a)
@@ -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 );
+
             // 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;