map store test review fixes