Fix test, and make map.scale=2