Merge "Add Vendor APEX to testdata"