Fixed failing UI tests