+ Added MockKeyValueStore