Yeah, there's already an integration test that hits these parts. The problem with those is that they require many different Riak configurations, and right now that means they basically don't get run on a regular basis. I'd prefer to keep these as a safety net, and I'm not sure if there's a much better way to express these.