Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r204c00c2a7d28b230e5929ed05f6c501f80fd8f6 -rc42203c6f42c89e70b7cd8b93e1fb88b984ca12a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 204c00c2a7d28b230e5929ed05f6c501f80fd8f6)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c42203c6f42c89e70b7cd8b93e1fb88b984ca12a)
@@ -46,6 +46,7 @@
 /// TODO: Restore to 100 when DPi flow control is fixed.
 #define DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN         250             ///< Patient connection sub-mode dialysate inlet pump flow rate in mL/min.
 
+#define PRE_TREATMENT_MIN_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      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.
@@ -1171,14 +1172,7 @@
 
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
-#ifndef 0 //_RELEASE_
-                if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
                 {
-                    reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
-                }
-                else
-#endif
-                {
                     DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
                     rsrvrCmd.reservoirID                     = (U32)DG_RESERVOIR_1;
@@ -1282,36 +1276,58 @@
     {
         if ( DG_RESERVOIR_1 == inactiveRes )
         {
-            volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
 #ifndef _RELEASE_
-            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_FILL_AND_FLUSH ) )
             {
-                volume = FILL_RESERVOIR_TO_VOLUME_ML;
+                volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
             }
+            else if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) )
+            {
+                volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
+            }
+            else
 #endif
+            {
+                volume = PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML;
+            }
         }
         // Reservoir 2
         else
         {
-            volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
 #ifndef _RELEASE_
-            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_FILL_AND_FLUSH ) )
             {
-                volume = FILL_RESERVOIR_TO_VOLUME_ML;
+                volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
             }
+            else if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) )
+            {
+                volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
+            }
+            else
 #endif
+            {
+                volume = PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML;
+            }
         }
     }
     // Flush fill volumes
     else
     {
-        volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
 #ifndef _RELEASE_
-        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_FILL_AND_FLUSH ) )
         {
-            volume = FILL_RESERVOIR_TO_VOLUME_ML;
+            volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
         }
+
+        else if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) )
+        {
+            volume = PRE_TREATMENT_MIN_RESERVOIR_VOLUME_ML;
+        }
+        else
 #endif
+        {
+            volume = PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML;
+        }
     }
 
     return volume;
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r660876bca7ae34f862ae9cc6feef9a30ec02fe94 -rc42203c6f42c89e70b7cd8b93e1fb88b984ca12a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 660876bca7ae34f862ae9cc6feef9a30ec02fe94)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision c42203c6f42c89e70b7cd8b93e1fb88b984ca12a)
@@ -590,7 +590,7 @@
 void execWetSelfTests( void )
 {
 #ifndef _RELEASE_
-    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) == SW_CONFIG_ENABLE_VALUE )
+    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) )
     {
         currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
     }
@@ -991,7 +991,7 @@
     else
     {
 #ifndef _RELEASE_
-        if ( SW_CONFIG_DISABLE_VALUE != getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
         {
 
             // Wait for reservoirs to drain before starting this test