Refactored test case for Storage