Index: shared/scripts/names.py
===================================================================
diff -u -rdd2540a25327b187e4a783682b400fbf711672a3 -r958b6bb16ed60d4aa4c2497a95d0315a76ac128c
--- shared/scripts/names.py	(.../names.py)	(revision dd2540a25327b187e4a783682b400fbf711672a3)
+++ shared/scripts/names.py	(.../names.py)	(revision 958b6bb16ed60d4aa4c2497a95d0315a76ac128c)
@@ -91,18 +91,8 @@
 o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True}
 # o_self_test_dry_progress_circle = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True}
 
-#settings_Home
-o_settings_Text = {"container": o_Gui_MainView, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True}
-o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True}
-o_settings_home_text_obj = {"container": o_SettingsHome_SettingsHome, "type": "Text", "unnamed": 1, "visible": True}
-o_eject_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True}
-o_arrow_btn = {"container": o_SettingsHome_SettingsHome, "id": "_image", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True}
-o_SettingsBase_SettingsBase = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase", "visible": True}
-o_settings_base_text_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
-o_service_date_obj = {"container": o_SettingsBase_SettingsBase, "type": "Text", "unnamed": 1, "visible": True}
-
 o_EndTreatmentRinseback_0_mL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True}
-o_rinseack_title = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
+o_rinseback_title = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True}
 o_EndTreatmentRinsebackInit_TimeText_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "gradient": 0, "objectName": "_TimeText", "type": "TimeText", "visible": True}
 o_EndTreatmentRinsebackInit_TimeText_minute_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "objectName": "_TimeText_minute", "type": "Text", "visible": True}
 o_EndTreatmentRinsebackInit_TimeText_hour_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "objectName": "_TimeText_hour", "type": "Text", "visible": True}
Index: tst_rinseback_setup/test.py
===================================================================
diff -u -r1da2d466f9f2501f10fd623cd48f3ae13e7c1faa -r958b6bb16ed60d4aa4c2497a95d0315a76ac128c
--- tst_rinseback_setup/test.py	(.../test.py)	(revision 1da2d466f9f2501f10fd623cd48f3ae13e7c1faa)
+++ tst_rinseback_setup/test.py	(.../test.py)	(revision 958b6bb16ed60d4aa4c2497a95d0315a76ac128c)
@@ -83,10 +83,10 @@
                                       blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, 
                                       treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value)
     for num in range(timer_default_value,count_down_value):
-        hd_simulator.cmd_send_treatment_rinseback_data(target_vol= float(0), current_vol= float(0), flow_rate= 0, timeout= num,timeout_countdown= num, is_completed= 0)
+        hd_simulator.cmd_send_treatment_rinseback_data(target_vol= count_down_default_value, current_vol= count_down_default_value, flow_rate= count_down_default_value, timeout= num,timeout_countdown= num, is_completed= 0)
         min,sec = utility.convert_seconds_into_min_and_sec(num)
-        test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_minute_Text).text),str(sec),"Vrifying seconds apeearing on UI")
-        test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_hour_Text).text),str(min),"Verifying minutes apeearing on UI")
+        test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_minute_Text).text),str(sec),"Verifying seconds appearing on UI")
+        test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_hour_Text).text),str(min),"Verifying minutes appearing on UI")
          
     test.compare(str(waitForObject(names.o_rinse_back_text).text),config.RINSE_BACK_SETUP_TEXT, "Rinseback Setup text must be {}".format(config.RINSE_BACK_SETUP_TEXT))
     test.verify(waitForObjectExists(names.o_rinse_back_text).enabled, " Start Rinseback button must be active")