anchor.diff:      [F(X) || X <- Nodes],
   
       %% Load the field array...
  -    FieldFile = basho_bench_config:get(riaksearch_fieldfile),
  +    FieldFile = basho_bench_config:get(riaksearch_fieldfile, undefined),
       %% FieldArray = file_to_array(FieldFile, 10),
       FieldArray = file_to_array(FieldFile),
       
       %% Load the word array...
  -    TermFile = basho_bench_config:get(riaksearch_termfile),
  +    TermFile = basho_bench_config:get(riaksearch_termfile, undefined),
       %% TermArray = file_to_array(TermFile, 100),
       TermArray = file_to_array(TermFile),
  +
  +    Query = basho_bench_config:get(riaksearch_query, undefined),
  +    E = basho_bench_config:get(riaksearch_expected, undefined),
       
       State = #state { 
           nodes=Nodes,
           fields=FieldArray, 
           terms=TermArray,
  -        queries=queue:new()
  +        queries=queue:new(),
  +        'query'=Query,
  +        expected=E
       },
       {ok, State}.
  -
   
   run('index', KeyGen, ValueGen, State) ->
       %% Make the index call...
  
positive.code: 
  new(_Id) ->
      MyNode = basho_bench_config:get(riaksearch_node),
      Cookie = basho_bench_config:get(riaksearch_cookie),
      net_kernel:start([MyNode]),
      erlang:set_cookie(node(), Cookie),
  
  
negative.code:             NewQueries = queue:in({QueryField, QueryTerm}, State#state.queries),
              {ok, State#state { queries=NewQueries }}
      end;
  
  run(search, _KeyGen, _ValueGen,
      S=#state{'query'=Query, expected=E, nodes=Nodes})
    when Query /= undefined ->
      %% Query will be a list of 1-3 args [Index, Query, Filter]
      %% e.g. ["index", "field:bar", "text:hello"]
      Node = choose(Nodes),
      Args = lists:map(fun list_to_binary/1, Query),
      {N, _} = rpc:call(Node, search, search, Args),
      case E of
          undefined -> {ok, S};
          _ ->
              if N == E -> {ok, S};
                 true ->
                      {error, ?FMT("Expected ~p but received ~p", [E, N]), S}
              end
      end;
  
  run(search, _KeyGen, _ValueGen, State) ->
      case queue:out(State#state.queries) of
          {{value, {QueryField, QueryTerm}}, NewQueries} ->
  