Prettify JSON tests and minimize diffs
Merge pull request #5055

2c930d9 Prettify JSON tests and minimize diffs (Pieter Wuille)