Generalizing map with transform. Fixed test.