Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rc4f3105da2ed8a7c40950588b54b79067185a3ad -rc940dea020a10f2bab23ae92aa6932c375c26dd4
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c4f3105da2ed8a7c40950588b54b79067185a3ad)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision c940dea020a10f2bab23ae92aa6932c375c26dd4)
@@ -1367,7 +1367,7 @@
 static DG_RESERVOIR_STATUS_T getRsrvrDrainStatus( DG_RESERVOIR_ID_T r, U32 drainSteadyStateTimeout, U32 timeout )
 {
     DG_RESERVOIR_STATUS_T status = DG_RESERVOIR_ABOVE_TARGET;
-    BOOL isDrainComplete         = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    BOOL isDrainComplete         = hasTargetDrainToZeroBeenReached( r, drainSteadyStateTimeout );
 
     // If the drain parameters of the reservoir is not initialized, initialize them
     if ( FALSE == haveDrainParamsBeenInit[ r ] )
Index: firmware/App/Modes/ModeChemicalDisinfectFlush.c
===================================================================
diff -u -rc4f3105da2ed8a7c40950588b54b79067185a3ad -rc940dea020a10f2bab23ae92aa6932c375c26dd4
--- firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision c4f3105da2ed8a7c40950588b54b79067185a3ad)
+++ firmware/App/Modes/ModeChemicalDisinfectFlush.c	(.../ModeChemicalDisinfectFlush.c)	(revision c940dea020a10f2bab23ae92aa6932c375c26dd4)
@@ -950,7 +950,7 @@
 
     // NOTE: the drain status should be checked once the reservoirs parameters are initialized. This is to make sure the
     // the timers for stable drain time are initialized prior to using them again
-    isDrainComplete = hasTargetDrainVolumeBeenReached( r, drainSteadyStateTimeout );
+    isDrainComplete = hasTargetDrainToZeroBeenReached( r, drainSteadyStateTimeout );
 
     if ( TRUE == isDrainComplete )
     {
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re58e3385eaf5e920335f963937b2e9f654a32cfe -rc940dea020a10f2bab23ae92aa6932c375c26dd4
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e58e3385eaf5e920335f963937b2e9f654a32cfe)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c940dea020a10f2bab23ae92aa6932c375c26dd4)
@@ -8,7 +8,7 @@
 * @file    ModeFill.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      26-Apr-2023
+* @date    (last)      11-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -609,11 +609,14 @@
             bicarbConductivitySampleCount = 0;
 
             // Set pumps flow rate to prepare for bicarb conductivity testing
-            setROPumpTargetFlowRateLPM( RO_PUMP_400_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( RO_PUMP_800_ML_PER_MIN / MILLILITERS_PER_LITER, TARGET_RO_PRESSURE_PSI );
 
             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;