More testing and fixes to memory store