Don't use cleanup_storage in the tests.