Better fix for callout UI tests