Fixed map test and implementation.