More map tests passing
More map_test tests passing
Merge pull request #8 from justinfagnani/map_test2

More map_test tests passing