Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rbd241ef5231a9869adaf7bb5ed166135beb2c0fb -r90d3a2eb18cc8282c0c68a23e39677327448781a
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision bd241ef5231a9869adaf7bb5ed166135beb2c0fb)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 90d3a2eb18cc8282c0c68a23e39677327448781a)
@@ -7,8 +7,8 @@
 *
 * @file    ConsumableSelfTest.c
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      24-Aug-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      04-Jan-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
@@ -18,6 +18,7 @@
 #include "ConsumableSelfTest.h"
 #include "DGInterface.h"
 #include "ModePreTreat.h"
+#include "NVDataMgmt.h"
 #include "Reservoirs.h"
 
 /**
@@ -76,14 +77,20 @@
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
 #ifdef SKIP_UI_INTERACTION
-            consumableInstallConfirmed = TRUE;
+            //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+            {
+                consumableInstallConfirmed = TRUE;
+            }
 #endif
             // TODO: Check for DG straw door status to be open once DG door driver implemented
             if ( TRUE == consumableInstallConfirmed )
             {
                 consumableInstallConfirmed = FALSE;
 #ifndef SKIP_CONSUMABLE_TESTS
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
+                //if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
+                {
+                    currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
+                }
 #else
                 currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
 #endif