Index: tst_rinseback_setup/test.py
===================================================================
diff -u -r2027a145f926b326b05974d8f643e3593ade85b7 -r7f00d4267d761927054c3a23d73b4415817342d5
--- tst_rinseback_setup/test.py	(.../test.py)	(revision 2027a145f926b326b05974d8f643e3593ade85b7)
+++ tst_rinseback_setup/test.py	(.../test.py)	(revision 7f00d4267d761927054c3a23d73b4415817342d5)
@@ -62,9 +62,9 @@
         test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_hour_Text).text),str(min), "Verifying minutes on timer in" + config.RINSE_BACK_SETUP_TEXT)
     test.endSection()
          
-    test.compare(str(waitForObject(names.o_start_rinseback_button_text).text),config.RINSEBACK_BUTTON_TEXT, "Start Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT))
-    test.verify(waitForObjectExists(names.o_start_rinseback_button_text).enabled, " Start Rinseback button must be active")
-    mouseClick(waitForObject(names.o_start_rinseback_button_text))
+    test.compare(str(waitForObject(names.o_start_rinseback_init_button_text).text),config.RINSEBACK_BUTTON_TEXT, "Start Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT))
+    test.verify(waitForObjectExists(names.o_start_rinseback_init_button_text).enabled, " Start Rinseback button must be active")
+    mouseClick(waitForObject(names.o_start_rinseback_init_button_text))
     verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION)
     verify_left_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION)
     verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION)
@@ -143,7 +143,7 @@
                                                saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, 
                                                blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value)
     test.startSection("Verifying count down value of timer in " + config.RINSEBACK_COMPLETE_TEXT)
-    for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE):
+    for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1):
         hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed= 0)
         min = utility.convert_seconds_into_min_and_sec(num, time_format="%M")
         sec = utility.convert_seconds_into_min_and_sec(num, time_format="%S")