rework tests, base storages, feed everything is modular