Cleared custom property mappings and tests