Make SerializableMapWrapper actually serialize, and add unit test