Index: suite_leahi/tst_end_of_treatment/test.py
===================================================================
diff -u -ra41aef5f49d9aed41b1d846a4c388459a7c5eed1 -r773bdca9f28d573177bb59389312e1a24b2f138c
--- suite_leahi/tst_end_of_treatment/test.py	(.../test.py)	(revision a41aef5f49d9aed41b1d846a4c388459a7c5eed1)
+++ suite_leahi/tst_end_of_treatment/test.py	(.../test.py)	(revision 773bdca9f28d573177bb59389312e1a24b2f138c)
@@ -117,17 +117,8 @@
     test.compare(config.MIN_SYSTOLIC+"/"+config.MIN_DIASTOLIC, blood_pressure,"Blood pressure value should be ->"+str(config.MIN_SYSTOLIC+"/"+config.MIN_DIASTOLIC))
     heart_rate = waitForObjectExists(names.o_treatmentHome_heartBeat_LabelValue).topText
     test.compare(config.MIN_HEARTRATE, heart_rate,"Heart Rate value should be ->"+str(config.MIN_HEARTRATE))
-    ultrafiltration_edit =waitForObjectExists(names.o_editButton_ultrafiltration_IconButton)
-    test.compare(ultrafiltration_edit.enabled,True,"Ultrafiltration edit button is enabled")
-    mouseClick(waitForObject(names.o_editButton_ultrafiltration_IconButton))
-    #check isolated,pause uf and edit uf button state
-    isolateduf_button = waitForObjectExists(names.o_isolatedUfButton_TouchRect)
-    test.compare(isolateduf_button.enabled,True,"Isolated UF button is enabled")
-    edituf_button =waitForObjectExists(names.o_editButton_TouchRect)
-    test.compare(not edituf_button.enabled,True,"Edit UF button is disabled")
-    pauseuf_button = waitForObjectExists(names.o_pauseResumeButton_TouchRect)
-    test.compare(not pauseuf_button.enabled,True,"Pause UF button is disabled")
-    mouseClick(names.o_image_Image)
+    ultrafiltration_edit = waitForObjectExists(names.o_editButton_ultrafiltration_IconButton)
+    test.compare(ultrafiltration_edit.enabled,False,"Ultrafiltration edit button is enabled")
     treatment_parameters_edit = waitForObjectExists(names.o_treatmentHome_editButton_IconButton_2)
     test.compare(treatment_parameters_edit.enabled,True,"Treatment parameters edit button is disabled")
     td.td_treatment_set_points    (blood_flow     = 51,
@@ -148,19 +139,22 @@
 
     # handle sent messages from UI 
     if can_interface is not None:
-        channel_id = CAN.DenaliChannels.ui_to_td_ch_id
+        channel_id = CAN.CanChannels.ui_to_td_ch_id
         message_id = MsgIds.MSG_ID_TD_END_TREATMENT_REQUEST.value
         can_interface.register_receiving_publication_function(channel_id,
                                                                message_id,
                                                                handle_end_of_treatment_request)
 
         
-    startApplication(config.AUT_NAME)
-    td.td_operation_mode(TDOpModes.MODE_STAN.value)
+    startApplication(utility.aut("-q"))
     
     # verify Standby screen
     test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby")
-    mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect))
+    td.td_operation_mode(TDOpModes.MODE_STAN.value)
+    hemodialysis        = waitForObject(names.o_createHDTreatment_TouchRect)
+    hemodialysis_btn    = utility.findChildByText(hemodialysis, "Hemodialysis")
+    mouseClick(hemodialysis_btn)
+    td.td_Treatment_Parameters_CreateRx(vRejectionReason =0)
     td.td_operation_mode(TDOpModes.MODE_PRET.value)
     utility.verify_create_treatment_parameters()
     change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value)