Merge "Split up XML and JSON testing."