Refactored StorageTest