Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r94d39c4d2f4f24c172785903b9d715583ab496b9 -r0078d0dfacacb1f77237d43526603a9e70d6ce42
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 94d39c4d2f4f24c172785903b9d715583ab496b9)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 0078d0dfacacb1f77237d43526603a9e70d6ce42)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      17-Mar-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      16-Jun-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -726,14 +726,6 @@
             transitionToCartridgeInstallation();
         }
     }
-    else
-    {
-        if ( ( NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE <= getNoCartSelfTestsState() ) &&
-             ( NO_CART_SELF_TESTS_STOPPED_STATE != getNoCartSelfTestsState() ) )
-        {
-            verifySwitchStatus();
-        }
-    }
 
     return state;
 }
@@ -1133,7 +1125,7 @@
         }
         else if ( dgCmdResp.rejectCode != DG_CMD_REQUEST_REJECT_REASON_NONE )
         {
-            // TODO - s/w fault
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_FILL_COMMAND_REJECTED, dgCmdResp.rejectCode )
         }
     }
 
@@ -1170,10 +1162,13 @@
                 state = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
                 reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
             }
-            else if ( ( TRUE == reservoirFilledStatus[ DG_RESERVOIR_1 ] ) && ( FALSE == reservoirFilledStatus[ DG_RESERVOIR_2 ] ) )
+            else
             {
-                reservoirFilledStatus[ DG_RESERVOIR_2 ] = TRUE;
-                state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
+                if ( FALSE == reservoirFilledStatus[ DG_RESERVOIR_2 ] )
+                {
+                    reservoirFilledStatus[ DG_RESERVOIR_2 ] = TRUE;
+                    state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
+                }
             }
         }
         else
@@ -1194,7 +1189,7 @@
                     cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
                 }
             }
-            else if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
+            else
             {
                 reservoirFlushedStatus[ DG_RESERVOIR_2 ] = TRUE;
                 cmdSetDGActiveReservoir( DG_RESERVOIR_2 );