Fixed few UI tests