Fixing issue with ITest VIPs.