Get rid of serialize_json (failing tests)