Some json output test cleanup. Added another testcase.