Polish up some of the json tests.