Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -r68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7 -r37a9fd8f15e413db5337371a7d1a1cb65567af7c
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 68aefeff8890cdfa956c7bfdf0d4505b4ac25cb7)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 37a9fd8f15e413db5337371a7d1a1cb65567af7c)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    ConsumableSelfTest.c
 *
-* @author  (last)      Quang Nguyen
-* @date    (last)      24-Aug-2021
+* @author  (last)      Dara Navaei
+* @date    (last)      22-Mar-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"
 
 /**
@@ -75,18 +76,23 @@
     switch( currentConsumableSelfTestState )
     {
         case CONSUMABLE_SELF_TESTS_INSTALL_STATE:
-#ifdef SKIP_UI_INTERACTION
-            consumableInstallConfirmed = TRUE;
-#endif
+
+            if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) )
+            {
+                consumableInstallConfirmed = TRUE;
+            }
             // 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;
-#else
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#endif
+                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;
+                }
             }
             break;