GBP: UT more robust for endpoint timeout