Update tests to reflect new JSON output changes.