Index: firmware/App/Modes/ConsumableSelfTest.c
===================================================================
diff -u -rf013ac5e5de456c4fa4367884cda6515f2a51642 -r1699da4737a1a176ed842cb30a887c9c2ffdfc94
--- firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision f013ac5e5de456c4fa4367884cda6515f2a51642)
+++ firmware/App/Modes/ConsumableSelfTest.c	(.../ConsumableSelfTest.c)	(revision 1699da4737a1a176ed842cb30a887c9c2ffdfc94)
@@ -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)      Dara Navaei
-* @date    (last)      04-Jan-2022
+* @author  (last)      Michael Garthwaite
+* @date    (last)      10-Mar-2022
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  06-Mar-2021
@@ -76,9 +76,7 @@
     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;
@@ -87,7 +85,6 @@
             if ( TRUE == consumableInstallConfirmed )
             {
                 consumableInstallConfirmed = FALSE;
-#ifndef SKIP_CONSUMABLE_TESTS
                 if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CONSUMABLES_TESTS ) != SW_CONFIG_ENABLE_VALUE )
                 {
                     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_FILL_CMD_STATE;
@@ -96,9 +93,6 @@
                 {
                     currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
                 }
-#else
-                currentConsumableSelfTestState = CONSUMABLE_SELF_TESTS_COMPLETE_STATE;
-#endif
             }
             break;