Some cleanup and more map_put tests