Working on the storage tests