Adapt prod related test ULPs