Updated UITest along with Clients Ui Changes