Refactor storage test to use new package
3 files changed