A few more tests
Starting on map handling