Storage test cases reworked