updated storage patch

testsuite adaptations
Merge pull request #476 from lslezak/storage_testsuite

Updated storage patch