Index: tst_pre_treatment_priming/test.py
===================================================================
diff -u -rbe84eb957d98563ee1edb9e52bcbbe785acb32cb -r59988a4c04f638c31de18016380de912a95a1527
--- tst_pre_treatment_priming/test.py	(.../test.py)	(revision be84eb957d98563ee1edb9e52bcbbe785acb32cb)
+++ tst_pre_treatment_priming/test.py	(.../test.py)	(revision 59988a4c04f638c31de18016380de912a95a1527)
@@ -29,13 +29,15 @@
                         "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE": 2, "DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE": 3, 
                         "DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE" : 4, "DRY_SELF_TESTS_PRESSURE_SENSORS_STATE" : 5, 
                         "DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE" : 6, "DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE" : 7,
-                        "DRY_SELF_TESTS_STOPPED_STATE" : 8, "DRY_SELF_TESTS_COMPLETE_STATE" : 9}
+                        "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_RESERVOIR_TWO_FILL_COMPLETE_STATE" : 7,
-                  "HD_PRIME_DIALYSATE_BYPASS_STATE" : 8, "HD_PRIME_WET_SELF_TESTS_STATE" : 9,
-                  "HD_PRIME_PAUSE" : 10, "HD_PRIME_COMPLETE" :11}
+                  "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}
 RECIRCULATE_STATES = {"PRE_TREATMENT_RECIRC_STATE" : 0, "PRE_TREATMENT_RECIRC_STOPPED_STATE" : 1}
 TEST_DRY_STEPS = ["Used Cartridge Check", "Occlusion Sensors Check", "Pressure Sensors Check", "Syringe Pump Check"]
 PRIMING_STEPS = ["Blood Circuit Priming", "Dialysate Circuit Priming", "Wet Self Tests"]
@@ -100,7 +102,7 @@
             verify_indicators(config.CHECK, "Occlusion Sensors Check")
             verify_indicators(config.CHECK, "Pressure Sensors Check") 
             verify_indicators(config.BUSY, "Syringe Pump Check")
-        elif state == "DRY_SELF_TESTS_STOPPED_STATE":   
+        elif (state == "DRY_SELF_TESTS__SYRINGE_PUMP_OCCLUSION_DETECTION_STATE") or (state == "DRY_SELF_TESTS_STOPPED_STATE"):   
             verify_indicators(config.CHECK, "Used Cartridge Check")
             verify_indicators(config.CHECK, "Occlusion Sensors Check")
             verify_indicators(config.CHECK, "Pressure Sensors Check") 
@@ -110,7 +112,7 @@
             verify_indicators(config.CHECK, "Used Cartridge Check")
             verify_indicators(config.CHECK, "Occlusion Sensors Check")
             verify_indicators(config.CHECK, "Pressure Sensors Check") 
-            verify_indicators(config.BUSY, "Syringe Pump Check")
+            verify_indicators(config.CHECK, "Syringe Pump Check")
             verify_completion_message_and_indicator(True, SELF_TEST_COMPLETION_MSG)
         test.endSection()
     test.endSection()
@@ -157,16 +159,16 @@
             else:
                 verify_start_priming_button(config.DISABLED)
                 verify_continue_button(config.DISABLED)
-        elif (state == "HD_PRIME_SALINE_SETUP_STATE") or (state == "HD_PRIME_SALINE_PURGE_AIR_STATE") or (state == "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE") or (state == "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_DIALYSER_STATE"):
+        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)
             verify_continue_button(config.DISABLED)
-        elif (state == "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_BYPASS_STATE"):
+        elif (state == "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE") or (state == "HD_PRIME_SALINE_DIALYSER_SETUP_STATE") or (state == "HD_PRIME_SALINE_DIALYSER_STATE") or (state == "HD_PRIME_DIALYSATE_DIALYSER_STATE")  or (state == "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_BYPASS_STATE"):
             verify_indicators(config.CHECK, "Blood Circuit Priming")
             verify_indicators(config.BUSY, "Dialysate Circuit Priming")
             verify_start_priming_button(config.DISABLED)     
             verify_continue_button(config.DISABLED)   
-        elif (state == "HD_PRIME_WET_SELF_TESTS_STATE") or (state == "HD_PRIME_PAUSE"):
+        elif state == "HD_PRIME_WET_SELF_TESTS_STATE":
             verify_indicators(config.CHECK, "Blood Circuit Priming")
             verify_indicators(config.CHECK, "Dialysate Circuit Priming")
             verify_start_priming_button(config.DISABLED)
@@ -230,10 +232,9 @@
     check_indicator = object.children(findObject(names.o_self_test_dry_progress_circle))
     check_indicator = objectMap.realName(check_indicator[2])
     if completed:
-        #TODO: uncomment once bug is resolved
-#         completion_msg = waitForObjectExists(utility.self_test_dry_check_list_text(msg))
-#         test.xcompare(completion_msg.visible, config.VISIBLE, "{} message should be displayed".format(msg))
-#         test.xcompare(completion_msg.text, msg, "Completion message should be {}".format(msg))
+        completion_msg = waitForObjectExists(utility.self_test_dry_check_list_text(msg))
+        test.compare(completion_msg.visible, config.VISIBLE, "{} message should be displayed".format(msg))
+        test.compare(completion_msg.text, msg, "Completion message should be {}".format(msg))
         if object.exists(check_indicator):
             test.passes("Check indicator should display on progress circle upon completion")
     else: