Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -rd92045b1bd0502912c00c977a01a13c3c84fcec9 -r18c32e8fca8e270576f227e64abc8117efd6d14d
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision d92045b1bd0502912c00c977a01a13c3c84fcec9)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 18c32e8fca8e270576f227e64abc8117efd6d14d)
@@ -18,6 +18,7 @@
 import squish
 from configuration import config
 from builtins import int as pyInt
+from dialin.common.hd_defs import HDOpModes
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.ui.utils import waitForGUI
 
@@ -81,7 +82,7 @@
     Method to navigate to sub mode under pre-treatment screen
     @param mode - (int) pre treatment state
     """
-    hd_simulator.cmd_set_hd_operation_mode_data(5,0)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,0)
     
     hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=mode, water_sample_state=0,consumables_self_test_state=0,
                                                    no_cartridge_self_test_state=0,installation_state=0, dry_self_test_state=0,
Index: tst_pre_treatment_consumables/test.py
===================================================================
diff -u -rd92045b1bd0502912c00c977a01a13c3c84fcec9 -r18c32e8fca8e270576f227e64abc8117efd6d14d
--- tst_pre_treatment_consumables/test.py	(.../test.py)	(revision d92045b1bd0502912c00c977a01a13c3c84fcec9)
+++ tst_pre_treatment_consumables/test.py	(.../test.py)	(revision 18c32e8fca8e270576f227e64abc8117efd6d14d)
@@ -22,18 +22,15 @@
 import names
 from dialin.ui import utils
 from configuration import config, utility
+from dialin.common.hd_defs import PreTreatmentSubModes, PreTreatmentConsumableSelfTestStates 
 from dialin.ui.hd_simulator import HDSimulator
 from dialin.ui.utils import waitForGUI
-from dialin.common.hd_defs import PreTreatmentConsumableSelfTestStates 
 
 hd_simulator  = HDSimulator()
 PRE_TREATMENT_STEP= 2
 num_of_instructions = 0
 SCREEN_OBJ= names.o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack
 
-
-
-
 def verify_right_instruction_navigation():
     """
         The method is used to verify the functionality of the right arrow in the instruction navigation, as well as the visibility of the two arrows  
@@ -118,7 +115,7 @@
     test.startSection("Verification of Check and busy indicators")
     test.log(" consumable self test state = 3")        
     hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=2, water_sample_state=0,
-                                                      consumables_self_test_state=3, no_cartridge_self_test_state=0,
+                                                      consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.value, no_cartridge_self_test_state=0,
                                                       installation_state=0, dry_self_test_state=0, prime_state=0,
                                                       recirculate_state=0, patient_connection_state=0)
     bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT)
@@ -128,8 +125,8 @@
     test.verify(not acid_indicator[1].visible," check indicator for acid pump must not be present")
     
     test.log(" consumable self test state = 4") 
-    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=2, water_sample_state=0,
-                                                      consumables_self_test_state=4, no_cartridge_self_test_state=0,
+    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_CONSUMABLE_SELF_TEST_STATE.value, water_sample_state=0,
+                                                      consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value, no_cartridge_self_test_state=0,
                                                       installation_state=0, dry_self_test_state=0, prime_state=0,
                                                       recirculate_state=0, patient_connection_state=0)
     bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT)
@@ -158,7 +155,7 @@
     global num_of_instructions
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME)
-    utility.navigate_to_pretreatment_screen(mode= PRE_TREATMENT_STEP)
+    utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_CONSUMABLE_SELF_TEST_STATE.value)
     utility.verify_page_step_indicator(SCREEN_OBJ, PRE_TREATMENT_STEP)
     
     test.startSection("verification of instruction navigation ")