Replace most mocking with a MemoryStore