Removed dependency on Redis in unit tests (cherry pick from Jim's branch...

...)