Index: tst_recirculate/test.py
===================================================================
diff -u -rf2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10
--- tst_recirculate/test.py	(.../test.py)	(revision f2eeafd6fa6977184f7cb090f97a4f7c1a04b1cb)
+++ tst_recirculate/test.py	(.../test.py)	(revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10)
@@ -52,10 +52,10 @@
     test.compare(str(waitForObject(names.o_recirculate_text).text), config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).text), config.RECONNECT_BUTTON_TEXT, "Reconnect button text must be {}".format(config.RECONNECT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).enabled, "Reconnect button must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_RECONNECT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_2))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea))
     verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
     verify_left_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
     verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION)
@@ -83,12 +83,12 @@
     test.compare(str(waitForObject(names.o_EndTreatmentBase_Reconnect_Text).text), config.RECONNECT_TEXT, "Reconnect text must be {}".format(config.RECONNECT_TEXT))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).text), config.BACK_TO_RECIRCULATE_TEXT, "Back to recirculate button text must be {}".format(config.BACK_TO_RECIRCULATE_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text).enabled, "Back to recirculate button must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_BACK_TO_RECIRCULATE_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_2))
     test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "End Treatment button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_END_TREATMENT_Text).enabled, "End Treatment button on recirculate stopped state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_END_TREATMENT_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea))
     test.verify(waitForObjectExists(names.o_EndTreatmentBase_confirm_Text).enabled, "Confirm button on recirculate stopped state screen must be active")
-    mouseClick(waitForObject(names.o_EndTreatmentBase_confirm_Text))
+    mouseClick(waitForObject(names.o_EndTreatmentBase_mouseArea_MouseArea_3))
     verify_rejection_messages_for_recirculate()
     test.endSection()