Move all metadata to one place in the JSON output
Fix test failures from [22d32cce0ddb9b05b]