Index: tst_end_treatment/test.py
===================================================================
diff -u -r71b3eaacc756a21d3d12b72efecfdfdbe00c7390 -r082dcf3879dd0e8e22386877ce7e2968e7d43026
--- tst_end_treatment/test.py	(.../test.py)	(revision 71b3eaacc756a21d3d12b72efecfdfdbe00c7390)
+++ tst_end_treatment/test.py	(.../test.py)	(revision 082dcf3879dd0e8e22386877ce7e2968e7d43026)
@@ -17,7 +17,6 @@
 # This test contradicts verification of post treatment section.
 
 import names
-import builtins
 from dialin.ui import utils
 from dialin.ui.hd_simulator import HDSimulator
 from configuration import config
@@ -26,12 +25,12 @@
 
 hd_simulator = HDSimulator()
        
-def verification_of_end_treatment_complete_state():    
+def verify_end_treatment_complete_state():    
     """
          Method to verify End treatment Treatment Complete state screens
     """
-    test.startSection("verifying End treatment Treatment Complete state screens")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_END_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, 
+    test.startSection("Verifying End treatment Treatment Complete state screens")
+    hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_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= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, 
                                                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)
     
@@ -42,25 +41,25 @@
     verify_end_treatment_states_rejection_msg()
     test.endSection()
 
-def verification_of_end_treatment_paused_state():    
+def verify_end_treatment_paused_state():    
     """
          Method to verify End treatment Treatment Paused state screens
     """    
-    test.startSection("verifying End treatment Treatment Paused state screens")
-    hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_END_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= TreatmentStates.TREATMENT_START_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 End treatment Treatment Paused state screens")
+    hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_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=TreatmentStates.TREATMENT_START_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.compare(str(waitForObject(names.o_end_treatment_complete_paused_state).text),config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT))
+    test.compare(str(waitForObject(names.o_end_treatment_complete_paused_state).text), config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT))
     test.endSection()
 
 def verify_end_treatment_states_rejection_msg():
     """
         Method to verify rinseback setup rejection messages
     """    
-    test.startSection("verifying rejection messages in rinseback screens ")
+    test.startSection("Verifying rejection messages in rinseback screens ")
     for reason_id in range(1, config.NUM_OF_REQUEST_REJECT_REASONS + 1):
-        hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 0, reason= reason_id)   
+        hd_simulator.cmd_send_treatment_adjust_end_response(accepted=0, reason=reason_id)   
         rejection_message = waitForObjectExists(utility.end_treatment_states_rejection_msg(text=config.REJECTION_REASON[reason_id]))
         test.compare(rejection_message.text, config.REJECTION_REASON[reason_id], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[reason_id]))
     test.endSection()
@@ -70,8 +69,8 @@
     
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME) 
-    verification_of_end_treatment_complete_state()
-    verification_of_end_treatment_paused_state()
+    verify_end_treatment_complete_state()
+    verify_end_treatment_paused_state()
     
     utils.tstDone()