fixes issue 2027 put/remove order
minor refactoring
improve test
improve test cont
review fix
Merge pull request #2041 from ahmetmircik/mapStoreTest

Fixes issue #2027