Added extract-map with fold, and unit test