rearange tests to use uiautomator fotr clicks