Importing more refugees from riak_test