Fix UI test errors