Fixing merge conflict
Coverage for serialize/deserialize