[WIP] test and tweak Mapper#map