Reverting the changes for storage tests