Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rd151b10e58a198a375a8434b618c72dd804976d8 -r3fc2a198a40b588b8d1a5684838be098456ad023
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision d151b10e58a198a375a8434b618c72dd804976d8)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3fc2a198a40b588b8d1a5684838be098456ad023)
@@ -48,11 +48,11 @@
 #define PRE_TREATMENT_FLUSH_FILL_TARGET_TEMP_C        45.0F             ///< Pre treatment flush fill target temperature in C.
 #define PRE_TREATMENT_NORMAL_FILL_TARGET_TEMP_C       ( 37.0F + 2.0F )  ///< Pre treatment normal fill target temperature in C.
 
-#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML    125               ///< 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    1300              ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
-#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML    750               ///< 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.
+#define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML      500             ///< 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      1300            ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
+#define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML      600             ///< 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.
 
 #define PRE_TREATMENT_FLUSH_COUNT                     2                 ///< Number of flush cycles for each reservoir.
 
@@ -1342,8 +1342,7 @@
      if ( TRUE == reservoirStatus[ inactiveRes ].flushComplete )
      {
  #ifndef _RELEASE_
-         if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
-              ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
+         if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) )
          {
              if ( DG_RESERVOIR_1 == inactiveRes )
              {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -rd151b10e58a198a375a8434b618c72dd804976d8 -r3fc2a198a40b588b8d1a5684838be098456ad023
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision d151b10e58a198a375a8434b618c72dd804976d8)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 3fc2a198a40b588b8d1a5684838be098456ad023)
@@ -580,8 +580,7 @@
     WET_SELF_TESTS_STATE_T priorSubState = currentWetSelfTestsState;
 
 #ifndef _RELEASE_
-    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
-         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
     {
         currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
     }