Preliminary changes for memory tests