Fix memory storage

Haven't run tests using memory storage for a while and found some broken tests.  Pickle storage is not working.