More UI Test revision