deleting property_map
merge
Fixing M3/unit tests