updated tests and refactored storages