more work on storage tests