Refactor uiautomation code and adjust tests