fixed loop on custom map
added test for capabilities