More map_test tests passing

19 tests passing now