Clean up `tests.storage.test_main` to remove use of legacy code.