Fix unit test to check new fields.

Note that assertJsonStringEquals is not really enabled; I updated
the JSON string but they're not really being tested right now (and
if I enable the assert, then other tests break). Also, not sure how
important are tests that check generated strings like that.