Fix missing lodash.map
Fix tests