Index: tst_pre_treatment_water_sample/test.py
===================================================================
diff -u -ra679c30b3c509df89397dce8fcef3e211eb61130 -rf43f15f8f6d0268b93bcf63c00c3dce3e60dcfae
--- tst_pre_treatment_water_sample/test.py	(.../test.py)	(revision a679c30b3c509df89397dce8fcef3e211eb61130)
+++ tst_pre_treatment_water_sample/test.py	(.../test.py)	(revision f43f15f8f6d0268b93bcf63c00c3dce3e60dcfae)
@@ -11,22 +11,24 @@
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 from configuration import utility
+from dialin.common.hd_defs import HDOpModes,PreTreatmentSampleWaterStates,PreTreatmentSubModes
 
+
 hd_simulator = HDSimulator()
 PRE_TREATMENT_STEP= 1
 
-def verification_of_sample_water_state_screens():
+def verify_sample_water_state_screens():
     """
     Method to verify the text and current state of the buttons and verify navigation within screen
     """
-    hd_simulator.cmd_set_hd_operation_mode_data(5,0)
+    hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value)
     
     test.log("Navigating to water sample main screen for verification")
     hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=1, water_sample_state=1,consumables_self_test_state=0,
     no_cartridge_self_test_state=0,installation_state=0, dry_self_test_state=0,
     prime_state=0,recirculate_state=0, patient_connection_state=0)
 
-    utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
+    utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
     test.compare(str(waitForObjectExists(names.o_water_sample_button).text), config.WATER_SAMPLE_BUTTON_TEXT,"Water Sample button text should be {}".format(config.WATER_SAMPLE_BUTTON_TEXT))
     test.compare(waitForObjectExists(names.o_water_sample_button).enabled , True, "Water Sample button should be enabled")
     mouseClick(waitForObject(names.o_water_sample_button))
@@ -37,7 +39,7 @@
     test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled")
     mouseClick(waitForObject(names.o_next_button))
     
-    utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
+    utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
     test.compare(str(waitForObjectExists(names.o_pass_button).text), config.PASS_TEXT,"Pass button text should be {}".format(config.PASS_TEXT))
     test.compare(waitForObjectExists(names.o_pass_button).enabled , True, "Pass button should be enabled")
     mouseClick(waitForObject(names.o_pass_button))
@@ -58,7 +60,7 @@
     test.compare(waitForObjectExists(names.o_fail_button).enabled , True, "Fail button should be enabled")
     mouseClick(waitForObject(names.o_fail_button))
     
-    utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
+    utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
     test.compare(str(waitForObjectExists(names.o_ok_button).text), config.OK_TEXT,"OK button text should be {}".format(config.OK_TEXT))
     test.compare(waitForObjectExists(names.o_ok_button).enabled , True, "OK button should be enabled")
     mouseClick(waitForObject(names.o_ok_button))
@@ -69,10 +71,10 @@
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME)
     test.log("Navigating to Filter Flush screen")
-    utility.navigate_to_pretreatment_screen(mode=1)
-    utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
+    utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value)
+    utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP)
     utility.verify_countdown(config.FILTER_FLUSH_TITLE)
-    verification_of_sample_water_state_screens()
+    verify_sample_water_state_screens()
     utils.tstDone()