add some test start refactoring storage