Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r809d8fc395e63afc52a13fc30087d2cf50ad4d9a -rae7ff6466ac1225cb5998990cc5163edc53ce003
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 809d8fc395e63afc52a13fc30087d2cf50ad4d9a)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision ae7ff6466ac1225cb5998990cc5163edc53ce003)
@@ -79,10 +79,10 @@
 #endif
             {
                 consumableInstallConfirmed = FALSE;
-#ifdef SKIP_CONSUMABLE_TESTS
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#else
+#ifndef SKIP_CONSUMABLE_TESTS
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
+#else
+                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
 #endif
             }
             break;
@@ -96,21 +96,21 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( DG_FILL_MODE_STATE_BICARB_PUMP_CHECK == getDGSubMode() ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_BICARB_PUMP_CHECK ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( DG_FILL_MODE_STATE_ACID_PUMP_CHECK == getDGSubMode() ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_ACID_PUMP_CHECK ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE;
             }
             break;
 
         case CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE:
-            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION == getDGSubMode() ) )
+            if ( ( DG_MODE_FILL == getDGOpMode() ) && ( getDGSubMode() >= DG_FILL_MODE_STATE_DIALYSATE_PRODUCTION ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 cmdStopDGFill();