Improve UI testcases