Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r3d3cc1e6819f83db631270dc0fd019d15739db08 -re679dd58bd01cdb94171a9948b024fe3c3c48f3c
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 3d3cc1e6819f83db631270dc0fd019d15739db08)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e679dd58bd01cdb94171a9948b024fe3c3c48f3c)
@@ -276,9 +276,9 @@
     if ( ( MODE_PRET == getCurrentOperationMode() ) &&
          ( HD_PRE_TREATMENT_CART_INSTALL_STATE == currentPreTreatmentState ) )
     {
-        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
+        if ( STATE_CLOSED == getSwitchStatus( PUMP_TRACK_SWITCH ) )
         {
-            if ( CONSUMABLE_SELF_TESTS_COMPLETE_STATE == getConsumableSelfTestState() )
+            if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
             {
                 if ( ( TRUE == isSyringeDetected() ) || ( ( bolusVol < NEARLY_ZERO ) && ( hepRate < NEARLY_ZERO ) ) )
                 {
@@ -293,12 +293,12 @@
             }
             else
             {
-                rejReason = REQUEST_REJECT_REASON_CONSUMABLE_NOT_READY;
+                rejReason = REQUEST_REJECT_REASON_DOOR_NOT_CLOSED;
             }
         }
         else
         {
-            rejReason = REQUEST_REJECT_REASON_DOOR_NOT_CLOSED;
+            rejReason = REQUEST_REJECT_REASON_PUMP_TRACK_NOT_CLOSED;
         }
     }
     else