Refactor StorageManager and add tests