Merge pull request #15 from nealcpeters/map_creation

Map creation
made tests pass again, one had to be pending
Merge pull request #16 from nealcpeters/eric_fixed_it

made tests pass again, one had to be pending