Further cleaning up in json_tests module