Cleanup StringAndJsonUtilsTests

Change-Id: I7d35492c439c9419915251387b0c12e205740586
4 files changed