refactor Ui-Tests