more work on memory storage & tests