Updated storage patch

testsuite adaptations