Test storage cfg (reverted from commit bc9f0e109f1022ce4b3078f5c31246b937a4fbf9)