Index: tst_post_treatment/test.py
===================================================================
diff -u -rffa29812cc49397be901378d94e5ac7dadd24d0c -ref6b58164d66c831ffaba8b71c57472cffac6c55
--- tst_post_treatment/test.py	(.../test.py)	(revision ffa29812cc49397be901378d94e5ac7dadd24d0c)
+++ tst_post_treatment/test.py	(.../test.py)	(revision ef6b58164d66c831ffaba8b71c57472cffac6c55)
@@ -40,6 +40,7 @@
 NUM_OF_DISPOSABLE_INSTALLATION_SCREENS = 7
 DISPOSABLES_STEP = 2
 PATIENT_DISCONNECTION_STEP = 0
+REVIEW_TREATMENT_STEP = 1
 
 rightarrow_obj_names = [names.o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase]
 leftarrow_obj_names = [names.o_PostTreatmentStack_patientDisconnectionConfirm_TreatmentFlowBase]
@@ -187,7 +188,7 @@
         Method to verify parameters under 'Patient Disconnection Screens'     
     """
     test.startSection("verifying Patient Disconnection screen")
-    utility.verify_page_step_indicator_post_treatment(SCREEN_OBJ1, PATIENT_DISCONNECTION_STEP)
+    utility.verify_page_step_indicator(SCREEN_OBJ1, PATIENT_DISCONNECTION_STEP, config.POST_TREATMENT_SCREENS)
     verify_right_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS)
     verify_left_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS)
     verify_right_instruction_navigation_patient_disconnection(NUM_OF_PATIENT_DISCONNECTION_SCREENS)
@@ -202,7 +203,7 @@
         Method to verify parameters under 'Treatment Review Screens'     
     """
     test.startSection("Verifying Treatment Review Screen")
-    utility.verify_page_step_indicator_post_treatment(SCREEN_OBJ2,1)
+    utility.verify_page_step_indicator(SCREEN_OBJ2, REVIEW_TREATMENT_STEP, config.POST_TREATMENT_SCREENS)
     test.compare(waitForObject(names.o_treatment_review_next_text).text, config.NEXT_TEXT, "NEXT button text must be NEXT")
     test.verify(not waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).enabled, " Export button should not be active")
     test.compare(str(waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).text), config.EXPORT_TEXT,"Export button text must be {}".format(config.EXPORT_TEXT))
@@ -218,7 +219,11 @@
         Method to verify parameters under 'Disposables screens'   
     """
     test.startSection("verification of Disposable Screen")
-    utility.verify_page_step_indicator_post_treatment(SCREEN_OBJ3, DISPOSABLES_STEP)
+    utils.waitForGUI(0.3)    #Delay given for screen navigation
+    mouseClick(waitForObjectExists(names.o_disposablesRemovalConfirm_BACK_Text))
+    utils.waitForGUI(0.3)    #Delay given for screen navigation
+    mouseClick(waitForObject(names.o_treatment_review_next_button))
+    utility.verify_page_step_indicator(SCREEN_OBJ3, DISPOSABLES_STEP, config.POST_TREATMENT_SCREENS)
     names.o_bullet_object.pop("occurrence")
     verify_right_instruction_navigation_disposables(NUM_OF_DISPOSABLE_INSTALLATION_SCREENS)
     test.verify(waitForObjectExists(names.o_disposables_removal_confirm_button).enabled, " confirm button must be active")