Simplify some tests to make test-data.json more sane to check for changes.