More work on the json integration tests.