Fixup UI tests