Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r26c9c46e181b72b7f3fd1128f5d509e01d6ae188 -r5892086c904c06dbdc15cb4b35749060e16c1c0a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 26c9c46e181b72b7f3fd1128f5d509e01d6ae188)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 5892086c904c06dbdc15cb4b35749060e16c1c0a)
@@ -48,8 +48,8 @@
 
 #define PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML           250             ///< Fill reservoir to this volume minimum to prep volume during development.
 #define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML         500             ///< Fill reservoir to this volume (in mL) to flush filter and lines.
-#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      900             ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
-#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      1100            ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML      1200            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      800             ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML          1500            ///< Fill reservoir to this volume minimum to prep volume during development.
 
 /// States of the pre-treatment reservoir management state machine.
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r5892086c904c06dbdc15cb4b35749060e16c1c0a
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 5892086c904c06dbdc15cb4b35749060e16c1c0a)
@@ -45,7 +45,7 @@
 #define BLOOD_PUMP_SLOW_FLOW_RATE_CIRC_BLOOD_CIRCUIT_ML_MIN 150                                                ///< Blood pump slow flow rate during prime recirculate blood circuit state.
 #define BLOOD_PUMP_FAST_FLOW_RATE_CIRC_BLOOD_CIRCUIT_ML_MIN 300                                                ///< Blood pump fast flow rate during prime recirculate blood circuit state.
 #define BLOOD_PUMP_FLOW_RATE_SALINE_DIALYZER_ML_MIN         300                                                ///< Blood pump flow rate during prime the saline dialyzer dialysate state.
-#define DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN               300                                                ///< Dialysate pump flow rate during priming fluid path.
+#define DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN               600                                                ///< Dialysate pump flow rate during priming fluid path.
 #define DPO_PUMP_PRIME_FLOW_RATE_ML_MIN                     225                                                ///< Dialysate outlet pump flow rate needed to match PWM with dialysate inlet pump @ 300 mL/min in open loop mode.
 
 #define DIALYSATE_DIALYZER_TUBE_VOLUME_ML                   115                                                ///< This total tube volume is used to calculate the Dpi & Dpo time out in the dialysate dialyzer state.
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r4e6093159809ef2ddc39d88401390caebe7fa293 -r5892086c904c06dbdc15cb4b35749060e16c1c0a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 4e6093159809ef2ddc39d88401390caebe7fa293)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 5892086c904c06dbdc15cb4b35749060e16c1c0a)
@@ -74,7 +74,8 @@
 #define WET_SELF_TEST_INTEGRATED_VOLUME_PCT_TOLERANCE       0.05F                                   ///< Tolerance on integrated volume as a percentage (5%).
 #define WET_SELF_TEST_INTEGRATED_VOLUME_TOLERANCE           20.0F                                   ///< Tolerance on integrated volume in grams.
 #define WET_SELF_TEST_DISPLACEMENT_TOLERANCE_G              20.0F                                   ///< Tolerance in the load cell readings of the displacement in grams.
-#define WET_SELF_TEST_DISPLACEMENT_TIME_MS                  ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms.
+#define WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS            ( SEC_PER_MIN * MS_PER_SECOND )         ///< Time to displace dialysate in wet self-test in ms (first).
+#define WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS           ( 30 * MS_PER_SECOND )                  ///< Time to displace dialysate in wet self-test in ms (second).
 #define RESERVOIR_SETTLE_TIME_MS                            ( 5 *  MS_PER_SECOND )                  ///< Time allotted for reservoir to settle in ms.
 
 #define MAX_NO_CARTRIDGE_SELF_TEST_TIME                     30                                      ///< Maximum no cartridge self-test time (in seconds).
@@ -1700,10 +1701,10 @@
         // This is not a volume for now and it is a flow rate.
         fmdIntegratedVolume += getMeasuredDialInFlowRate();
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
+            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_FIRST_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_FIRST_DISPLACEMENT_VERIFY_STATE;
         }
@@ -1842,10 +1843,10 @@
     {
         fmdIntegratedVolume += getMeasuredDialInFlowRate();
 
-        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_DISPLACEMENT_TIME_MS ) )
+        if ( TRUE == didTimeout( displacementStartTime, WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) )
         {
             signalDialInPumpHardStop();
-            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_DISPLACEMENT_TIME_MS ) );
+            fmdIntegratedVolume = ( ( fmdIntegratedVolume * TASK_GENERAL_INTERVAL ) / ( WET_SELF_TEST_SECOND_DISPLACEMENT_TIME_MS ) );
             settleStartTime     = getMSTimerCount();
             state               = WET_SELF_TESTS_SECOND_DISPLACEMENT_VERIFY_STATE;
         }