Clean up JSON Golden Tests, Part 6

[mdimjasevic]

This patch further cleans up JSON golden tests. This is continuation of PRs #1729, #1732, #1733, #1756 and #1762.

Checklist

• The PR Title explains the impact of the change.
• The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
• changelog.d contains the following bits of information:
  • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.