Ready for surf_map implementation testing