Fix 6 UI test failures