Added indecies to #map and #filter, added tests for #map