to_json test updates #420