anchor.diff:      {Res, _} = are_selections_valid(DDL, Selections, ?CANTBEBLANK),
       ?assertEqual(false, Res).
   
  -simple_are_selections_valid_test() ->
  -    Bucket = <<"simple_are_selections_valid_test">>,
  +%%
  +%% Query Validation tests
  +%%
  +
  +simple_is_query_valid_test() ->
  +    Bucket = <<"simple_is_query_valid_test">>,
       Selections  = [["temperature"], ["geohash"]],
  -    Query = #riak_kv_li_index_v1{bucket      = Bucket,
  -				 selections  = Selections},
  +    Query = #riak_kv_li_index_v1{bucket     = Bucket,
  +				 selections = Selections},
       DDL = make_ddl(Bucket,
   		    [
   		     #riak_field_v1{name     = "temperature",
  
positive.code:     Res = riak_kv_ddl:is_query_valid(DDL, Query),
      ?assertEqual(true, Res).
  
  -endif.
  
negative.code:     Res = riak_kv_ddl:is_query_valid(DDL, Query),
      ?assertEqual(true, Res).
  
  simple_is_query_valid_map_wildcard_test() ->
      Bucket = <<"simple_is_query_valid_map_wildcard_test">>,
      Name0 = "name",
      Name1 = "temp",
      Name2 = "geo",
      Selections  = [["temp", "*"], ["name"]],
      Query = #riak_kv_li_index_v1{bucket     = Bucket,
  				 selections = Selections},
      Map = {map, [
  		 #riak_field_v1{name     = Name2,
  				position = 1,
  