Re-apply UI test fix