Update and move VendorProduct test