fixup UI related test failures