Index: tst_instructions_poc/test.py
===================================================================
diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r2e73714b63ae5fd2ef8b5acca5043e136454feff
--- tst_instructions_poc/test.py	(.../test.py)	(revision 84c1284ecff1f30169d50afb688be18934eb8506)
+++ tst_instructions_poc/test.py	(.../test.py)	(revision 2e73714b63ae5fd2ef8b5acca5043e136454feff)
@@ -19,7 +19,8 @@
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
 from configuration import utility
-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.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates,  PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates
+from dialin.hd.reservoirs import HDReservoirStates
 from dialin.ui.utils import waitForGUI
 
 hd_simulator = HDSimulator()
@@ -325,8 +326,9 @@
      
     test.startSection("Navigating to Pre-Treatment Sample screen")
     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)  
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_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_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value,
+                                                    wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value )  
     index = verify_instruction_and_image("Water Sample",index = 0) 
     index = verify_instruction_and_image("Water Sample Result",index = index)     
     index = verify_instruction_and_image("Water Sample Result Failed",index = index)
@@ -336,7 +338,8 @@
     test.startSection("Navigating to Pre-Treatment Consumables screen")
     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)
+                                                    prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value,
+                                                    wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value)
     index = verify_instruction_and_image("Consumables Installation",index = index)
     rightarrow_obj_names.pop(first_index)
     test.endSection()
@@ -357,9 +360,11 @@
                                                     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,
+                                                    prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,
                                                     recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 
-                                                    patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)   
+                                                    patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value,
+                                                    wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, 
+                                                    pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value)   
     text_obj_names.pop(first_index) 
     index = verify_instruction_and_image("Cartridge Installation",index = index)
     text_obj_names.pop(first_index)
@@ -386,9 +391,11 @@
                                                     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,
+                                                    prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,
                                                     recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, 
-                                                    patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value)
+                                                    patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value,
+                                                    wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value,
+                                                    pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value )
     hd_simulator.cmd_send_pre_treatment_continue_to_treament_response(accepted=True, reason=0)
     hd_simulator.cmd_send_uf_treatment_response(accepted = True, reason = 0, volume  = 120)
     test.log("Clicking on skip button in BP/HR screen")