Made this less riak_test ish looking.