Use Redis instance from a DI
Add load an restart tests
Minor bugfixes and more code refactoring