More tests and functionality for map.py