updated to support new maps, fix tests