Consolidated json and xml tests
Consolidated json and xml tests