Test should be done now
Cleaning up test for performance. Removed not unused methods in the MemoryStore. All 1800 test now run in less then 2 minutes
Removed some redundancies and used UniquieID instead of manually converting the byte array.
Fixed merge conflict.
Merge branch 'annotation_rpc' into next_storage.

Fixing a very tint merge conflict. A majority of all tests should have been fixed now.