Refactored riak test server