Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r775a6184140e3425384e0cdbd224aab1dd829d10 -r6742b3e355d70e0bdf036ed93cc2268bdd36cb99
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 775a6184140e3425384e0cdbd224aab1dd829d10)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6742b3e355d70e0bdf036ed93cc2268bdd36cb99)
@@ -56,12 +56,12 @@
 
 typedef struct
 {
+    BOOL initialDrain;                                                  ///< Flags indicate whether a reservoir has been requested to initially drain.
     BOOL startFlushFill;                                                ///< Flags "GO" for a flush reservoir fill, to synchronize with self-test requirements
     BOOL startNormalFill;                                               ///< Flags "GO" for a normal reservoir fill, to synchronize with self-test requirements
-    BOOL filledStatus;                                                  ///< Flag indicates a reservoir has been filled.
-    BOOL flushedStatus;                                                 ///< Flag indicates a reservoir has been flushed.
-    BOOL initialDrain;                                                  ///< Flags indicate whether a reservoir has been requested to initially drain.
-    U08  flushCount;                                                     ///< Flag indicates the number of reservoir flush cycles required.
+    BOOL fillComplete;                                                  ///< Flag indicates a reservoir has been filled.
+    BOOL flushComplete;                                                 ///< Flag indicates a reservoir has been flushed.
+    U08  flushCount;                                                    ///< Flag indicates the number of reservoir flush cycles required.
 } PRE_TREATMENT_RESERVOIR_VAR_T;
 
 /// States of the pre-treatment reservoir management state machine.
@@ -100,9 +100,9 @@
 static PRE_TREATMENT_RESERVOIR_VAR_T reservoirStatus[ NUM_OF_DG_RESERVOIRS ];   ///< Detailed state of each reservoir.
 
 #ifndef _RELEASE_
-const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirStatusDisable = {FALSE,FALSE,FALSE,FALSE,FALSE,(0)};
+const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPrimingDisabled = {FALSE,FALSE,FALSE,FALSE,FALSE,(0)};
 #endif
-const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirStatusInit = {FALSE,FALSE,FALSE,FALSE,FALSE,PRE_TREATMENT_FLUSH_COUNT};
+const  PRE_TREATMENT_RESERVOIR_VAR_T reservoirPretreatmentInit = {FALSE,FALSE,FALSE,FALSE,FALSE,PRE_TREATMENT_FLUSH_COUNT};
 
 // ********** private function prototypes **********
 
@@ -154,15 +154,15 @@
     {
         for ( reservoirIndex = 0; reservoirIndex < NUM_OF_DG_RESERVOIRS; reservoirIndex++ )
         {
-            reservoirStatus[reservoirIndex] = reservoirStatusDisable;
+            reservoirStatus[reservoirIndex] = reservoirPrimingDisabled;
         }
     }
     else
 #endif
     {
         for ( reservoirIndex = 0; reservoirIndex < NUM_OF_DG_RESERVOIRS; reservoirIndex++ )
         {
-            reservoirStatus[reservoirIndex] = reservoirStatusInit;
+            reservoirStatus[reservoirIndex] = reservoirPretreatmentInit;
         }
     }
 
@@ -535,7 +535,7 @@
  *************************************************************************/
 BOOL getReservoirFillStatus( DG_RESERVOIR_ID_T reservoirID )
 {
-    return reservoirStatus[ reservoirID ].filledStatus;
+    return reservoirStatus[ reservoirID ].fillComplete;
 }
 
 /*********************************************************************//**
@@ -723,12 +723,7 @@
             fillReservoirOneStartRequested = TRUE;
             transitionToNoCartSelfTests();
         }
-#ifndef _RELEASE_
-        if ( SW_CONFIG_DISABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_PUMP ) )
-#endif
-        {
-            signalActionToResumeFill();
-        }
+        signalActionToResumeFill();
     }
 
     return state;
@@ -1099,15 +1094,15 @@
             volume = getPreTreatmentFillVolume( inactiveReservoir );
 
             // not flushed and need to fill
-            if ( ( TRUE != reservoirStatus[ inactiveReservoir ].flushedStatus ) &&
+            if ( ( TRUE != reservoirStatus[ inactiveReservoir ].flushComplete ) &&
                  ( TRUE == reservoirStatus[ inactiveReservoir ].startFlushFill ) )
             {
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );
                 state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
             }
 
             // flushed and need to fill after entering dry self test state
-            if ( ( TRUE == reservoirStatus[ inactiveReservoir ].flushedStatus ) &&
+            if ( ( TRUE == reservoirStatus[ inactiveReservoir ].flushComplete ) &&
                  ( TRUE == reservoirStatus[ inactiveReservoir ].startNormalFill ) &&
                  ( currentPreTreatmentState >= HD_PRE_TREATMENT_SELF_TEST_DRY_STATE ) )
             {
@@ -1174,20 +1169,20 @@
 
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].flushedStatus ) &&
-             ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushedStatus ) )
+        if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].flushComplete ) &&
+             ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].flushComplete ) )
         {
-            if ( FALSE == reservoirStatus[ activeReservoir ].filledStatus )
+            if ( FALSE == reservoirStatus[ activeReservoir ].fillComplete )
             {
-                reservoirStatus[ activeReservoir ].filledStatus = TRUE;
+                reservoirStatus[ activeReservoir ].fillComplete = TRUE;
                 state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
             }
         }
         else
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
 
-            if ( FALSE == reservoirStatus[ activeReservoir ].flushedStatus )
+            if ( FALSE == reservoirStatus[ activeReservoir ].flushComplete )
             {
                 DG_SWITCH_RSRVRS_CMD_T rsrvrCmd;
 
@@ -1197,7 +1192,7 @@
                 }
                 if ( 0 == reservoirStatus[ activeReservoir ].flushCount )
                 {
-                    reservoirStatus[ activeReservoir ].flushedStatus = TRUE;
+                    reservoirStatus[ activeReservoir ].flushComplete = TRUE;
                 }
                 rsrvrCmd.reservoirID                     = activeReservoir;
                 rsrvrCmd.useLastTrimmerHeaterDC          = FALSE;
@@ -1285,7 +1280,7 @@
     U32 volume = 0;
 
     // Fill volumes after flushing
-    if ( TRUE == reservoirStatus[ inactiveRes ].flushedStatus )
+    if ( TRUE == reservoirStatus[ inactiveRes ].flushComplete )
     {
         if ( DG_RESERVOIR_1 == inactiveRes )
         {
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r51271a582fec5adf763c21c026cf29fb6796e09a -r6742b3e355d70e0bdf036ed93cc2268bdd36cb99
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 51271a582fec5adf763c21c026cf29fb6796e09a)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6742b3e355d70e0bdf036ed93cc2268bdd36cb99)
@@ -591,7 +591,8 @@
 void execWetSelfTests( void )
 {
 #ifndef _RELEASE_
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) //SW_CONFIG_DISABLE_WET_SELF_TEST
+    if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
+         ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
     {
         currentWetSelfTestsState = WET_SELF_TESTS_COMPLETE_STATE;
     }