Fixed few more UI tests