Better Redis and Riak cleanup in tests