Update redis-conf for the tests
Update makefile
Refactor