Index: shared/scripts/configuration/utility.py
===================================================================
diff -u -r9b04cc323c54bbd0bdd8bd2dee62a154d375b401 -r923e0245388dc99d9e98a4b49f49df083cff88f9
--- shared/scripts/configuration/utility.py	(.../utility.py)	(revision 9b04cc323c54bbd0bdd8bd2dee62a154d375b401)
+++ shared/scripts/configuration/utility.py	(.../utility.py)	(revision 923e0245388dc99d9e98a4b49f49df083cff88f9)
@@ -130,13 +130,13 @@
     test.startSection("Verify the count down time in application")
     for count_down in range(MAXIMUM_COUNTDOWN_TIME, MINIMUM_COUNTDOWN_TIME-1, -1):
         if screen_title == BEGIN_PRIME_TITLE:
-            hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(total=300, countdown=count_down)
+            hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(300, count_down)
         elif screen_title == PRIMING_TITLE:
-            hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(timeout=300, countdown=count_down)
+            hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(300, count_down)
         elif screen_title == SYSTEM_SELF_TEST_TITLE:
-            hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(total=300, countdown=count_down)
+            hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(300, count_down)
         else:
-            dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(total=300, countdown=count_down)
+            dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(300, count_down)
         actual_time = get_time(screen_title)
         expected_time = convert_seconds_into_min_and_sec(count_down)
         test.compare(actual_time, expected_time, "Actual count down time: {} should be equal to expected count down time {}".format(actual_time, expected_time))
Index: tst_pre_treatment_priming/test.py
===================================================================
diff -u -r3e40eac9e8561b15007fefa4ee82344e3b1a1254 -r923e0245388dc99d9e98a4b49f49df083cff88f9
--- tst_pre_treatment_priming/test.py	(.../test.py)	(revision 3e40eac9e8561b15007fefa4ee82344e3b1a1254)
+++ tst_pre_treatment_priming/test.py	(.../test.py)	(revision 923e0245388dc99d9e98a4b49f49df083cff88f9)
@@ -34,7 +34,7 @@
         is displayed
     """
     test.startSection("Navigating to self test dry screen and verify the 'Begin Prime' title is displayed")
-    navigate_to_pretreatment_screen(mode=5)
+    navigate_to_pretreatment_screen(5)
     title = (waitForObjectExists(self_test_dry_check_list_text(BEGIN_PRIME_TITLE))).text
     test.compare(title, BEGIN_PRIME_TITLE, "{} title should be displayed when user is navigating to self test dry screen".format(BEGIN_PRIME_TITLE))
     test.endSection()
@@ -47,7 +47,7 @@
         is displayed
     """
     test.startSection("Navigating to priming screen and verify the begin 'Priming' title is displayed")
-    navigate_to_pretreatment_screen(mode=6)
+    navigate_to_pretreatment_screen(6)
     title = (waitForObject(self_test_dry_check_list_text(PRIMING_TITLE))).text
     test.compare(title, PRIMING_TITLE, "{} title should be displayed when user is navigating to 'Priming' screen".format(PRIMING_TITLE))
     test.endSection()
@@ -67,32 +67,32 @@
         installation_state=0, dry_self_test_state=index, prime_state=0,
         recirculate_state=0, patient_connection_state=0)
         if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"):
-            verify_the_indicators(indicator=None, steps=TEST_DRY_STEPS)
+            verify_the_indicators(None, TEST_DRY_STEPS)
         elif state == "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE":
-            verify_the_indicators(indicator=BUSY, steps="Used Cartridge Check")
+            verify_the_indicators(BUSY, "Used Cartridge Check")
         elif state == "DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE":
-            verify_the_indicators(indicator=CHECK, steps="Used Cartridge Check")
-            verify_the_indicators(indicator=BUSY, steps="Occlusion Sensors Check")
+            verify_the_indicators(CHECK, "Used Cartridge Check")
+            verify_the_indicators(BUSY, "Occlusion Sensors Check")
         elif (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE") or (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_STATE") or (state == "DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE"):
-            verify_the_indicators(indicator=CHECK, steps="Used Cartridge Check")
-            verify_the_indicators(indicator=CHECK, steps="Occlusion Sensors Check")
-            verify_the_indicators(indicator=BUSY, steps= "Pressure Sensors Check")
+            verify_the_indicators(CHECK, "Used Cartridge Check")
+            verify_the_indicators(CHECK, "Occlusion Sensors Check")
+            verify_the_indicators(BUSY, "Pressure Sensors Check")
         elif state == "DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE":   
-            verify_the_indicators(indicator=CHECK, steps="Used Cartridge Check")
-            verify_the_indicators(indicator=CHECK, steps="Occlusion Sensors Check")
-            verify_the_indicators(indicator=CHECK, steps="Pressure Sensors Check") 
-            verify_the_indicators(indicator=BUSY, steps="Syringe Pump Check")
+            verify_the_indicators(CHECK, "Used Cartridge Check")
+            verify_the_indicators(CHECK, "Occlusion Sensors Check")
+            verify_the_indicators(CHECK, "Pressure Sensors Check") 
+            verify_the_indicators(BUSY, "Syringe Pump Check")
         elif state == "DRY_SELF_TESTS_STOPPED_STATE":   
-            verify_the_indicators(indicator=CHECK, steps="Used Cartridge Check")
-            verify_the_indicators(indicator=CHECK, steps="Occlusion Sensors Check")
-            verify_the_indicators(indicator=CHECK, steps="Pressure Sensors Check") 
-            verify_the_indicators(indicator=CHECK, steps="Syringe Pump Check")
+            verify_the_indicators(CHECK, "Used Cartridge Check")
+            verify_the_indicators(CHECK, "Occlusion Sensors Check")
+            verify_the_indicators(CHECK, "Pressure Sensors Check") 
+            verify_the_indicators(CHECK, "Syringe Pump Check")
             verify_completion_message_and_indicator(False, SELF_TEST_COMPLETION_MSG)
         else:
-            verify_the_indicators(indicator=CHECK, steps="Used Cartridge Check")
-            verify_the_indicators(indicator=CHECK, steps="Occlusion Sensors Check")
-            verify_the_indicators(indicator=CHECK, steps="Pressure Sensors Check") 
-            verify_the_indicators(indicator=BUSY, steps="Syringe Pump Check")
+            verify_the_indicators(CHECK, "Used Cartridge Check")
+            verify_the_indicators(CHECK, "Occlusion Sensors Check")
+            verify_the_indicators(CHECK, "Pressure Sensors Check") 
+            verify_the_indicators(BUSY, "Syringe Pump Check")
             verify_completion_message_and_indicator(True, SELF_TEST_COMPLETION_MSG)
         test.endSection()
     test.endSection()
@@ -111,9 +111,9 @@
         consumables_self_test_state=0, no_cartridge_self_test_state=0,
         installation_state=0, dry_self_test_state=0, prime_state=0,
         recirculate_state=index, patient_connection_state=0)
-        verify_the_indicators(indicator=CHECK, steps="Blood Circuit Priming")
-        verify_the_indicators(indicator=CHECK, steps="Dialysate Circuit Priming")
-        verify_the_indicators(indicator=BUSY, steps="Wet Self Tests")
+        verify_the_indicators(CHECK, "Blood Circuit Priming")
+        verify_the_indicators(CHECK, "Dialysate Circuit Priming")
+        verify_the_indicators(BUSY, "Wet Self Tests")
         verify_completion_message_and_indicator(True, PRIMING_COMPLETE_MSG)
         verify_the_continue_button(ENABLED)
         test.endSection()
@@ -140,23 +140,23 @@
                 verify_the_start_priming_button(DISABLED)
                 verify_the_continue_button(DISABLED)
         elif (state == "HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE") or (state == "HD_PRIME_RESERVOIR_ONE_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_DIALYSER_STATE"):
-            verify_the_indicators(indicator=BUSY, steps="Blood Circuit Priming")
+            verify_the_indicators(BUSY, "Blood Circuit Priming")
             verify_the_start_priming_button(DISABLED)
             verify_the_continue_button(DISABLED)
         elif (state == "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE") or (state == "HD_PRIME_DIALYSATE_BYPASS_STATE"):
-            verify_the_indicators(indicator=CHECK, steps="Blood Circuit Priming")
-            verify_the_indicators(indicator=BUSY, steps="Dialysate Circuit Priming")
+            verify_the_indicators(CHECK, "Blood Circuit Priming")
+            verify_the_indicators(BUSY, "Dialysate Circuit Priming")
             verify_the_start_priming_button(DISABLED)     
             verify_the_continue_button(DISABLED)   
         elif (state == "HD_PRIME_WET_SELF_TESTS_STATE") or (state == "HD_PRIME_PAUSE"):
-            verify_the_indicators(indicator=CHECK, steps="Blood Circuit Priming")
-            verify_the_indicators(indicator=CHECK, steps="Dialysate Circuit Priming")
+            verify_the_indicators(CHECK, "Blood Circuit Priming")
+            verify_the_indicators(CHECK, "Dialysate Circuit Priming")
             verify_the_start_priming_button(DISABLED)
             verify_the_continue_button(DISABLED)
         else:   
-            verify_the_indicators(indicator=CHECK, steps="Blood Circuit Priming")
-            verify_the_indicators(indicator=CHECK, steps="Dialysate Circuit Priming")
-            verify_the_indicators(indicator=BUSY, steps="Wet Self Tests")
+            verify_the_indicators(CHECK, "Blood Circuit Priming")
+            verify_the_indicators(CHECK, "Dialysate Circuit Priming")
+            verify_the_indicators(BUSY, "Wet Self Tests")
             verify_the_start_priming_button(DISABLED)
             verify_completion_message_and_indicator(False, PRIMING_COMPLETE_MSG)
             verify_the_continue_button(DISABLED)