Mock store
Refactor store for testing