map store test review fixes
Merge pull request #1903 from ahmetmircik/mapStoreTestImprovements

map store test fixes