Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r6cb41faf89ea5500a378c2d845c1b9bb552b4b30 -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6cb41faf89ea5500a378c2d845c1b9bb552b4b30)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
@@ -75,7 +75,7 @@
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
 #ifndef SKIP_CONSUMABLE_TESTS
-            if ( TRUE == confirmConsumableInstallRequested )
+            if ( TRUE == consumableInstallConfirmed )
 #endif
             {
                 consumableInstallConfirmed = FALSE;
Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r6cb41faf89ea5500a378c2d845c1b9bb552b4b30 -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 6cb41faf89ea5500a378c2d845c1b9bb552b4b30)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
@@ -480,17 +480,22 @@
 static HD_PRE_TREATMENT_MODE_STATE_T handleWaterSampleState( void )
 {
     HD_PRE_TREATMENT_MODE_STATE_T state = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
+    DG_OP_MODE_T dgOpMode = getDGOpMode();
+    U32 dgSubMode = getDGSubMode();
 
     execSampleWater();
 
 #ifndef SKIP_SAMPLE_WATER
     if ( TRUE == isSampleWaterPassed() )
 #endif
     {
-        state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-        cmdStartDG();
-        cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
-        transitionToConsumableSelfTest();
+        if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
+        {
+            state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
+            cmdStartDG();
+            cmdSetDGDialysateTargetTemps( 39.0, 37.0 );
+            transitionToConsumableSelfTest();
+        }
     }
 
     return state;
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r6cb41faf89ea5500a378c2d845c1b9bb552b4b30 -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 6cb41faf89ea5500a378c2d845c1b9bb552b4b30)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
@@ -375,6 +375,9 @@
 {
     HD_PRE_TREATMENT_PRIME_STATE_T state = HD_PRIME_WAIT_FOR_USER_START_STATE;
 
+    // Keep updating start time until the user requested priming
+    primeStartTime = getMSTimerCount();
+
 #ifndef SKIP_UI_INTERACTION
     if ( TRUE == primeStartRequested )
 #endif
@@ -622,9 +625,11 @@
         signalResumeSelfTests();
     }
 
+#ifndef SKIP_WET_SELF_TESTS
     execWetSelfTests();
 
     if ( TRUE == isWetSelfTestsPassed() )
+#endif
     {
         state = HD_PRIME_COMPLETE;
     }
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r6cb41faf89ea5500a378c2d845c1b9bb552b4b30 -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 6cb41faf89ea5500a378c2d845c1b9bb552b4b30)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
@@ -990,10 +990,6 @@
         }
     }
 
-#ifdef SKIP_WET_SELF_TESTS
-    state = WET_SELF_TESTS_COMPLETE_STATE;
-#endif
-
     return state;
 }