map store test improvements