Some cleanup in JsonDumpGeneratorTest

Change-Id: I79a89f43132170310abf42f9f8255abff595d401
Merge "Some cleanup in JsonDumpGeneratorTest"