Complete storage and tests