Fix a couple of map issues and add tests for items in the README
Update the README