Refactor class names
Redis tests now also pass