Refactor to make redis tests pass

@ridhoq is bad at async programming