Merge "Add unit test for EditDeserializer"