fixed some of the test so that they can run with the MemoryStore