Index: tst_pre_treatment_priming/test.py
===================================================================
diff -u -re8535a7e3c30daad306221dd3d0c822f6994d503 -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25
--- tst_pre_treatment_priming/test.py	(.../test.py)	(revision e8535a7e3c30daad306221dd3d0c822f6994d503)
+++ tst_pre_treatment_priming/test.py	(.../test.py)	(revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25)
@@ -29,13 +29,13 @@
                         "DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE" : 6, "DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE" : 7,
                         "DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE" : 8,
                         "DRY_SELF_TESTS_STOPPED_STATE" : 9, "DRY_SELF_TESTS_COMPLETE_STATE" : 10}
-PRIMING_STATES = {"HD_PRIME_START_STATE" : 0, "HD_PRIME_WAIT_FOR_USER_START_STATE" : 1, 
-                  "HD_PRIME_SALINE_SETUP_STATE" : 2, "HD_PRIME_SALINE_PURGE_AIR_STATE" : 3,
-                  "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE" : 4, "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE" : 5,
-                  "HD_PRIME_DIALYSATE_DIALYSER_STATE" : 6, "HD_PRIME_SALINE_DIALYSER_SETUP_STATE": 7,
-                  "HD_PRIME_SALINE_DIALYSER_STATE": 8, "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE" : 9,
-                  "HD_PRIME_DIALYSATE_BYPASS_STATE" : 10, "HD_PRIME_WET_SELF_TESTS_STATE" : 11,
-                  "HD_PRIME_PAUSE" : 12, "HD_PRIME_COMPLETE" :13}
+PRIMING_STATES = {"HD_PRIME_WAIT_FOR_USER_START_STATE" : 0, 
+                  "HD_PRIME_SALINE_SETUP_STATE" : 1, "HD_PRIME_SALINE_PURGE_AIR_STATE" : 2,
+                  "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE" : 3, "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE" : 4,
+                  "HD_PRIME_DIALYSATE_DIALYSER_STATE" : 5, "HD_PRIME_SALINE_DIALYSER_SETUP_STATE": 6,
+                  "HD_PRIME_SALINE_DIALYSER_STATE": 7, "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE" : 8,
+                  "HD_PRIME_DIALYSATE_BYPASS_STATE" : 9, "HD_PRIME_WET_SELF_TESTS_STATE" : 10,
+                  "HD_PRIME_PAUSE" : 11, "HD_PRIME_COMPLETE" :12}
 RECIRCULATE_STATES = {"PRE_TREATMENT_RECIRC_STATE" : PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, "PRE_TREATMENT_RECIRC_STOPPED_STATE" : PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STOPPED_STATE.value}
 
                         
@@ -175,17 +175,16 @@
     for state, index in PRIMING_STATES.items():
         test.startSection("Passing {} state".format(state))
         hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_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_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value,
+                                                    no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE.value,
                                                     prime_state=index,
                                                     recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value,
-                                                    wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value,
+                                                    wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_STOPPED_STATE.value,
                                                     pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value)
-        
-        if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE"):
+        utils.waitForGUI(1)
+        if (state == "HD_PRIME_WAIT_FOR_USER_START_STATE"):
             verify_indicators(None, config.PRIMING_STEPS)
-            if state == "HD_PRIME_WAIT_FOR_USER_START_STATE":
-                verify_start_priming_button(config.ENABLED)
-                hd_simulator.cmd_send_pre_treatment_prime_start_response(config.ACCEPTED, 0)
+            verify_start_priming_button(config.ENABLED)
+            hd_simulator.cmd_send_pre_treatment_prime_start_response(config.ACCEPTED, 0)
         elif (state == "HD_PRIME_SALINE_SETUP_STATE") or (state == "HD_PRIME_SALINE_PURGE_AIR_STATE") or (state == "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE"):
             verify_indicators(config.BUSY, "Blood Circuit Priming")
             verify_start_priming_button(config.DISABLED)