Fix tests for map_layers and map_builder