Index: suite_leahi/suite.conf
===================================================================
diff -u -rd0541e8a1e64248961d52dd9492e92fd79b5177a -rb954c55399e6efc6f4d23daddf96b0fb4a3d8f98
--- suite_leahi/suite.conf	(.../suite.conf)	(revision d0541e8a1e64248961d52dd9492e92fd79b5177a)
+++ suite_leahi/suite.conf	(.../suite.conf)	(revision b954c55399e6efc6f4d23daddf96b0fb4a3d8f98)
@@ -1,6 +1,6 @@
 AUT=leahi
 LANGUAGE=Python
 OBJECTMAPSTYLE=script
-TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription
+TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_end_of_treatment
 VERSION=3
 WRAPPERS=Qt
Index: suite_leahi/tst_end_of_treatment/test.py
===================================================================
diff -u -rccc837e1c29f80a5c280de09ff637e280bd9333c -rb954c55399e6efc6f4d23daddf96b0fb4a3d8f98
--- suite_leahi/tst_end_of_treatment/test.py	(.../test.py)	(revision ccc837e1c29f80a5c280de09ff637e280bd9333c)
+++ suite_leahi/tst_end_of_treatment/test.py	(.../test.py)	(revision b954c55399e6efc6f4d23daddf96b0fb4a3d8f98)
@@ -3,37 +3,42 @@
 # Functionalities: Testing all functionalities of End of Treatment 
 #
 # Steps: 
-#     Create Rx validate and confirm and Navigate to main treatment
-#     In Main Treatment set the treatment state to TREATMENT_END_STATE from the simulator
-#     Verify Dialysis Treatment Complete popup is visible
-#     Test first the Stay on Treatment button
-#     Verify the following:
-#         A new headerbar icon is available (This brings up that same Complete popup)
-#         Treatment time edit is disabled
-#         Saline Start Bolus is enabled
-#         Vitals is enabled - Enter vitals and confirm you can take a reading
-#         Pressures edit is enabled
-#         Ultrafiltration edit is enabled but when opened
-#             ONLY Isolated UF is enabled and all other options disabled
-#         Treatment parameters Edit button is disabled
-#         User canm only edit bloodflow. other parameters are disabled.
-#     Open the popup and press end treatment
-#     Check request message from UI and change the treatment state to rinseback
+#     1. Navigate to Create Rx page set all the values 
+#     2. Validate and confirm all the values in create Rx page
+#     3. Navigate to Main treatment page
+#     4. In Main Treatment set the treatment state to TREATMENT_END_STATE from the simulator
+#     5. Verify Dialysis Treatment Complete popup is visible in main treatment page
+#     6. On Dialysis Treatment Complete popup  Click on Stay on Treatment button
+#         Verify the following:
+#             a. New headerbar icon is available 
+#             b. Treatment time edit button is disabled
+#             c. Saline Start Bolus edit button is enabled
+#             d. Vitals button is enabled - Enter vitals values and check the values are displaying 
+#             e. Pressures edit button is enabled
+#             f. Ultrafiltration edit button is enabled After click on edit icon
+#                 Only Isolated UF button is enabled and all other buttons are disabled
+#             g.Treatment parameters Edit button is disabled
+#             h. User can only edit bloodflow button
+#     7.Open the Dialysis Treatment complete popup and press end treatment
+#     8.Check request message from UI and change the treatment state to Rinseback state
 
 import names
 import can
-from leahi_dialin.ui import utils
+from leahi_dialin.ui              import utils
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.ui.td_messaging import TD_Messaging
-from configuration import utility, config
-from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates
+from configuration                import utility, config
+from leahi_dialin.common.td_defs  import TDOpModes,TDTreatmentStates
 from leahi_dialin.protocols       import CAN
 td =TD_Messaging()
 
 endTreatmentState = "-1"
 
 
 def change_treatmentstates(state):
+    """Method to change the treatment states to different sub state
+    @return : Change the state from simulator
+    """
     test.startSection("Change the treatment parameter") 
     td.td_tx_state( state,
                     0 ,
@@ -161,11 +166,9 @@
     utility.verify_create_treatment_parameters()
     change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value)
     change_treatmentstates(TDTreatmentStates.TREATMENT_END_STATE.value)
-    test.startSection("Check the button state when user enter stay on treatment state")
     verify_stay_treatment_state()
-    test.endSection()
-    
-    test.startSection("Check the values when user in end treatment state")
+
+    test.startSection("Check the UI behavior when user in end treatment state")
     mouseClick(waitForObject(names.o_treatmentCompleteButton_TreatmentCompleteButton))
     mouseClick(waitForObject(names.o_confirmTouch_ConfirmButton))
     test.verify(waitFor("'endTreatmentState == 6'", 5000), "Testing UI -> TD message end state")