Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rc9df9f42e294adae397a57bf83c2a67fa831b164 -rafa9d4924d55ac4fc98270a012e92dd1f6ee65d0
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision c9df9f42e294adae397a57bf83c2a67fa831b164)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision afa9d4924d55ac4fc98270a012e92dd1f6ee65d0)
@@ -219,7 +219,6 @@
             break;
 
         default:
-            currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE, (U32)currentPreTreatmentState );
             break;
     }
@@ -330,9 +329,11 @@
     BOOL accepted = FALSE;
     REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM;
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == patientConnectionConfirm )
+#ifdef SKIP_UI_INTERACTION
+    patientConnectionConfirm = TRUE;
 #endif
+
+    if ( TRUE == patientConnectionConfirm )
     {
         if ( ( MODE_PRET == getCurrentOperationMode() ) && ( HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE == currentPreTreatmentState ) )
         {
@@ -373,6 +374,10 @@
         case ALARM_ACTION_END_TREATMENT:
             if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState )
             {
+                if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState )
+                {
+                    cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+                }
                 requestNewOperationMode( MODE_STAN );
             }
             else
@@ -617,9 +622,11 @@
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_CART_INSTALL_STATE;
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == confirmInstallRequested )
+#ifdef SKIP_UI_INTERACTION
+    confirmInstallRequested = TRUE;
 #endif
+
+    if ( TRUE == confirmInstallRequested )
     {
         confirmInstallRequested = FALSE;
         state = HD_PRE_TREATMENT_SELF_TEST_DRY_STATE;
@@ -731,9 +738,11 @@
 
     execPreTreatmentRecirc();
 
-#ifndef SKIP_UI_INTERACTION
-    if ( TRUE == continueToTreatmentRequested )
+#ifdef SKIP_UI_INTERACTION
+    continueToTreatmentRequested = TRUE;
 #endif
+
+    if ( TRUE == continueToTreatmentRequested )
     {
         continueToTreatmentRequested = FALSE;
         state = HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE;
@@ -999,8 +1008,12 @@
 
             if ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] )
             {
+#ifdef SKIP_PRIMING
+                reservoirFilledStatus[ DG_RESERVOIR_1 ] = TRUE;
+#else
                 reservoirFlushedStatus[ DG_RESERVOIR_1 ] = TRUE;
                 cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
+#endif
             }
             else if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( FALSE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
             {