Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r581064e4188c15307a70bc4265974d61dea23ff8 -r7c5eba5948a1ed940252c6fe0b1c56f17b313980
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 581064e4188c15307a70bc4265974d61dea23ff8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 7c5eba5948a1ed940252c6fe0b1c56f17b313980)
@@ -54,7 +54,7 @@
 #define RO_PUMP_800_ML_PER_MIN                          800.0F                                               ///< RO pump speed of 800.0 mL/minute.
 #define TARGET_RO_FLOW_RATE_IN_PAUSE_L                    0.8F                                               ///< Target flow rate for RO pump during pause in liters.
 #define MILLILITERS_PER_LITER                           1000.0F                                              ///< One liter is 1000 milliliters
-#define ACID_PUMP_23_ML_PER_MIN                         22.5F //23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
+#define ACID_PUMP_23_ML_PER_MIN                         23.0F                                                ///< Acid pump speed of 23.0 mL/minute.
 #define BICARB_PUMP_40_ML_PER_MIN                       40.0F                                                ///< Bicarb pump speed of 40.0 mL/minute.
 #define CONCENTRATE_PUMP_40_ML_PER_MIN                  40.0F                                                ///< Concentrate pump speed of 40.0 mL/minute.
 
@@ -73,6 +73,7 @@
 #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 CONCENTRATE_ACID_TEST_TIME_OUT_MS               ( 60 * MS_PER_SECOND )
 #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.
 
@@ -783,7 +784,7 @@
         acidConductivitySampleCount++;
     }
 
-    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_TEST_TIME_OUT_MS ) )
+    if ( TRUE == didTimeout( concentrateTestStartTime, CONCENTRATE_ACID_TEST_TIME_OUT_MS ) )
     {
         F32 acidCondUSPerCM      = chemicalsCond.fillCondValues[ chemicalsTypes.acidType ][ FILL_COND_ACID_TEST ].acidConduSPerCM;
         BOOL hasAcidTestPassed   = FALSE;