Improve storage tests