Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r2c70c24f7c5ead2322ec56f740277f0654ad281a -r404b16f95153db3c8f83fccd18abc98164bb31fd
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2c70c24f7c5ead2322ec56f740277f0654ad281a)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 404b16f95153db3c8f83fccd18abc98164bb31fd)
@@ -65,14 +65,12 @@
 
 #define FLOW_INTEGRATED_VOLUME_CHECK_TOLERANCE          0.1F                                                 ///< Flow integrated volume has 10% tolerance compare to load cell reading.
 
-#define ACID_TEST_CD1_TCD                               12252.1F                                             ///< Used for testing CD1 acid theoretical conductivity.
-#define ACID_TEST_CD2_TCD                               ACID_TEST_CD1_TCD                                    ///< Used for testing CD2 acid theoretical conductivity.
-#define BICARB_TEST_CD2_TCD                             6820.91F                                             ///< Used for testing CD2 bicarb theoretical conductivity.
 #define FIVE_PERCENT_FACTOR                             0.05F                                                ///< 5.0 / 100.0  used to calculate conductivity within range of -/+ 5%.
 #define RO_PUMP_LOOKUP_TABLE_SIZE                       4                                                    ///< Size of array used as RO pump speed lookup table.
 #define CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN       5.0F                                                 ///< Concentrate pump additional speed during priming in mL/min.
 #define CONCENTRATE_TEST_TIME_OUT_MS                    ( 30 * MS_PER_SECOND )                               ///< Concentrate test time out period in ms.
 #define DELAY_FMP_CHECK_START_BY_MS                     ( 10 * MS_PER_SECOND )                               ///< Delay start of FMP check during dialysate deliver state by this amount of time (in ms).
+#define CONCENTRATE_TEST_COND_COLLECTION_DELAY_MS       ( 5 * MS_PER_SECOND )                                ///< Concentrate test conductivity data collection delay in milliseconds.
 
 #define MAX_RO_REJECTION_RATIO_ALLOW                    0.10F                                                ///< Maximum RO rejection ratio.
 #define MAX_CPO_CONDUCTIVITY_ALLOW                      100.0F                                               ///< Maximum CPo sensor conductivity value.
@@ -638,8 +636,11 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_TEST_BICARB_CONDUCTIVITY;
     F32 bicarbConductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 
-    totalBicarbConductivity += bicarbConductivity;
-    bicarbConductivitySampleCount++;
+    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_COND_COLLECTION_DELAY_MS ) )
+    {
+        totalBicarbConductivity += bicarbConductivity;
+        bicarbConductivitySampleCount++;
+    }
 
     if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {
@@ -709,11 +710,14 @@
     F32 acidConductivity        = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
     F32 bicarbConductivity      = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 
-    totalBicarbConductivity += bicarbConductivity;
-    bicarbConductivitySampleCount++;
+    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_COND_COLLECTION_DELAY_MS ) )
+    {
+        totalBicarbConductivity += bicarbConductivity;
+        bicarbConductivitySampleCount++;
 
-    totalAcidConductivity += acidConductivity;
-    acidConductivitySampleCount++;
+        totalAcidConductivity += acidConductivity;
+        acidConductivitySampleCount++;
+    }
 
     if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
     {