Test's UI refactoring