Vendor roundup to simplify test running