Merge "Revert "Split up XML and JSON testing.""