Index: shared/scripts/configuration/strings.py
===================================================================
diff -u -r2961accdbc24fa832a3c6fa3f12fa52ce7938124 -r6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03
--- shared/scripts/configuration/strings.py	(.../strings.py)	(revision 2961accdbc24fa832a3c6fa3f12fa52ce7938124)
+++ shared/scripts/configuration/strings.py	(.../strings.py)	(revision 6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03)
@@ -3,6 +3,7 @@
 #rinseback-setup
 RINSE_BACK_SETUP_TEXT = "Rinseback Setup"
 RINSEBACK_BUTTON_TEXT = "START RINSEBACK"
+BACK_TO_TREATMENT_BUTTON_TEXT = "BACK TO TREATMENT"
 END_IMAGE_BUTTON_TEXT = "End"
 DECELERATE_BUTTON_TEXT = "Decelerate"
 ACCELERATE_BUTTON_TEXT = "Accelerate"
Index: shared/scripts/names.py
===================================================================
diff -u -r7f00d4267d761927054c3a23d73b4415817342d5 -r6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03
--- shared/scripts/names.py	(.../names.py)	(revision 7f00d4267d761927054c3a23d73b4415817342d5)
+++ shared/scripts/names.py	(.../names.py)	(revision 6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03)
@@ -65,6 +65,10 @@
 o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback Start button text 
 o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True}
+#Rinseback back to treatment button text
+o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
+#Rinseback end treatment button text
+o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback END image and button text
 o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True}
 #Decelerate Image text and button text
@@ -83,6 +87,8 @@
 o_EndTreatmentRinsebackComplete_END_TREATMENT_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback complete Additional text
 o_EndTreatmentRinsebackComplete_ADDITIONAL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "ADDITIONAL", "type": "Text", "unnamed": 1, "visible": True}
+#Rinseback complete back to treatment text
+o_EndTreatmentRinsebackComplete_Back_to_treatment_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback Additional rinseback text
 o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True}
 #Rinseback setup Progress circle
Index: tst_rinseback_setup/test.py
===================================================================
diff -u -r7f00d4267d761927054c3a23d73b4415817342d5 -r6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03
--- tst_rinseback_setup/test.py	(.../test.py)	(revision 7f00d4267d761927054c3a23d73b4415817342d5)
+++ tst_rinseback_setup/test.py	(.../test.py)	(revision 6b7f3b97693e2c1a4c246b4ba48e23ad99f78c03)
@@ -46,6 +46,7 @@
         Method to navigate and verify to Rinseback Stop INIT state screens
     """
     test.startSection("verifying Rinseback Stop INIT state screens")
+    hd_simulator.cmd_set_treatment_time(sec_total = 120, sec_elapsed = 20, sec_remain = 100)
     hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDOpSubModes.SUBMODE_START.value)
     hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, 
                                                saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,
@@ -65,6 +66,12 @@
     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))
+    test.compare(str(waitForObject(names.o_init_rinseback_back_to_treatment_button_text).text),config.BACK_TO_TREATMENT_BUTTON_TEXT, "Back to treatment button text on rinseback init state screen must be {}".format(config.BACK_TO_TREATMENT_BUTTON_TEXT))
+    test.verify(waitForObjectExists(names.o_init_rinseback_back_to_treatment_button_text).enabled, " Back to treatment button on rinseback init state screen must be active")
+    mouseClick(waitForObject(names.o_init_rinseback_back_to_treatment_button_text))
+    test.compare(str(waitForObject(names.o_init_rinseback_end_treatment_button_text).text),config.END_TREATMENT_BUTTON_TEXT, "End  treatment button text on rinseback init state screen must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
+    test.verify(waitForObjectExists(names.o_init_rinseback_end_treatment_button_text).enabled, " End treatment button on rinseback init state screen must be active")
+    mouseClick(waitForObject(names.o_init_rinseback_end_treatment_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)
@@ -139,6 +146,8 @@
         Method to navigate and verify to Rinseback Stop state screens
     """
     test.startSection("verifying Rinseback Stop state screens")
+#     hd_simulator.cmd_send_treatment_rinseback_data(target_vol = 2, current_vol = 1, flow_rate = 1, timeout = 4,
+#                     timeout_countdown = 8, is_completed = True)
     hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, 
                                                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)
@@ -154,11 +163,13 @@
     test.compare(str(waitForObject(names.o_EndTreatmentRinsebackComplete_Rinseback_Complete_Text).text), config.RINSEBACK_COMPLETE_TEXT, "Rinseback Complete text must be {}".format(config.RINSEBACK_COMPLETE_TEXT))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "END TREATMENT button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text).enabled, "END TREATMENT button must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text))
-     
+    mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text))     
     test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text).text), config.ADDITIONAL_BUTTON_TEXT, "ADDITIONAL button text must be {}".format(config.ADDITIONAL_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text).enabled, "ADDITIONAL button must be active")
     mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text))
+    test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).text), config.BACK_TO_TREATMENT_BUTTON_TEXT, "BACK TO TREATMENT button text must be {}".format(config.BACK_TO_TREATMENT_BUTTON_TEXT))
+    test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).enabled, "BACK TO TREATMENT button on rinse back complete screen must be active")
+    mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text))
     verify_rinseback_rejection_msg()
     test.endSection()