tests
Merge branch 'master' into tests
Merge branch 'master' into tests
changed redis config for local tests
Merge branch 'master' into tests
fixed tests, lots of refactoring to do now