Merge payments tests in v1-train

Not adding to manifests yet since we may want to stabilize our tests more before running them in the marketplace tests job.