Updated EzStorage and EzStorageTest methods