Obviously this is not a SOLUTION, it's an intermediary step in resolving the redis dependency issues. this PR isn't mergable until the tests are restored.