fixed tests, two fails but removed mocking because we do not want to use this. Implementing this in the memory store later.