Starting to improve storage.
Fixing storage tests.