Ui test improvements