map store test fixes