refactored tests - extracted storage api and data