Better rediscloud support, and tests