Tidied up tests of map data preparation code