Fixed tests to work with refactored storage