add test to maps
fix maps with deferred