:add: scoped UT and :fix: bugs on storage