Upgrade Tests to allow VendorExtensions