Index: tst_instructions_poc/test.py
===================================================================
diff -u -r0778c9cc04a3414612e79d1bbfe7c1aebb56c1c3 -r6bb43117bca2673c5de877f5b70b094da344418a
--- tst_instructions_poc/test.py	(.../test.py)	(revision 0778c9cc04a3414612e79d1bbfe7c1aebb56c1c3)
+++ tst_instructions_poc/test.py	(.../test.py)	(revision 6bb43117bca2673c5de877f5b70b094da344418a)
@@ -19,7 +19,7 @@
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 from configuration import utility
-from dialin.common.hd_defs import HDOpModes, HDOpSubModes, HDInitStates, PreTreatmentSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates,  PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, PreTreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates
+from dialin.common.hd_defs import HDOpModes, HDStandbyStates, HDInitStates, PreTreatmentSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates,  PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, PreTreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates
 from dialin.ui.utils import waitForGUI
 
 hd_simulator = HDSimulator()
@@ -322,8 +322,8 @@
     hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value)    
      
     test.startSection("Navigating to Pre-Treatment Sample screen")
-    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
-                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
+    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
                                                     prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)  
     index = verify_instruction_and_image("Water Sample",index = 0) 
     index = verify_instruction_and_image("Water Sample Result",index = index)     
@@ -332,27 +332,27 @@
     test.endSection()
       
     test.startSection("Navigating to Pre-Treatment Consumables screen")
-    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
-                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
+    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
                                                     prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)
     index = verify_instruction_and_image("Consumables Installation",index = index)
     rightarrow_obj_names.pop(first_index)
     test.endSection()
      
     test.startSection("Method to navigate to create custom treatment to set all parameters")    
-    hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_TPAR.value , sub_mode = HDOpSubModes.STANDBY_START_STATE.value)
+    hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_TPAR.value , sub_mode = HDStandbyStates.STANDBY_START_STATE.value)
     mouseClick(waitForObject(names.o_input_patient_id))
     type(waitForObject(names.o_input_patient_id), "abcd")
     mouseClick(waitForObject(names.o_continue_button))
     verify_create_custom_treatment_parameter()
     test.endSection()
          
     test.startSection("Navigating to Pre-Treatment Disposables screen")
-    hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_PRET.value , sub_mode = HDOpSubModes.STANDBY_START_STATE.value)
-    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, 
+    hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_PRET.value , sub_mode = HDStandbyStates.STANDBY_START_STATE.value)
+    hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, 
                                                    water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,
                                                    consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
-                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,
                                                     installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, 
                                                     dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
                                                     prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,
@@ -381,7 +381,7 @@
     test.log("Navigating to Pre-Treatment Ultrafiltration screen")
     hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value,
                                                     water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value,
-                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,
                                                     installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, 
                                                     dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
                                                     prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,