cleanup; more work on memory store testing
finished testing