[client][managed][offline] minor refactoring in the store
Merge pull request #422 from hasankhan/storerefactor

[client][managed][offline] minor refactoring in the store
[client][managed][offline] minor rename in tests