Vendor related test updates