Cleaning up test for performance. Removed not unused methods in the MemoryStore. All 1800 test now run in less then 2 minutes