Speed up some tests by using memory stores.
Cleanup.