Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rfa41b85cf47fb01cd905b2ed53d472a9cb0c1706 -r6d500da57b7590f105f7b39261af4321998d2175
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision fa41b85cf47fb01cd905b2ed53d472a9cb0c1706)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 6d500da57b7590f105f7b39261af4321998d2175)
@@ -74,10 +74,11 @@
     switch( currentConsumableSelfTestState )
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
-#ifndef SKIP_CONSUMABLE_TESTS
+#ifdef SKIP_UI_INTERACTION
+            consumableInstallConfirmed = TRUE;
+#endif
             // TODO: Check for DG straw door status to be open once DG door driver implemented
             if ( TRUE == consumableInstallConfirmed )
-#endif
             {
                 consumableInstallConfirmed = FALSE;
 #ifndef SKIP_CONSUMABLE_TESTS
@@ -89,7 +90,7 @@
             break;
 
         case CONSUMABLE_SELF_TESTS_FILL_CMD_STATE:
-            if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+            if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
             {
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_WATER_QUALITY_CHECK_STATE;
                 cmdStartDGFill( FILL_RESERVOIR_TO_VOLUME_ML );
@@ -122,6 +123,7 @@
             break;
 
         default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_CONSUMABLE_SELF_TEST_STATE, currentConsumableSelfTestState );
             break;
     }