Refactor storage.ts into testable modules and add unit tests

Refactor storage.ts into testable modules and add unit tests #1251