refactor riak test server