Fix implementation and tests for map
Merge pull request #10 from pennappslabs/map

Fix implementation and tests for map