Refactor of the way the changed propertyDescriptors are serialized; Corrected the tests