Speed up Riak tests a bit locally
More test rewrites for atomicity