Structure out the storage part
Fix gevent monkeypatch problem and let the unittest run without a problem