Added tests that work for current map.py