Better Redis and Riak cleanup in tests

More yak shaving for #246.