Fix test skipping when Riak is unavailable

We've had a few extra Riak usages sneak in since we last tested that our test skipping worked.