anchor.diff:      Ancestors = ancestors([A, AWat]),
       ?assertEqual(0, length(Ancestors)).
   
  -reconcile_test() ->
  -    {O,O3} = ancestor_test(),
  -    O3 = riak_object:reconcile([O,O3],true),
  -    O3 = riak_object:reconcile([O,O3],false),
  -    {O,O3}.
  -
  -merge1_test() ->
  -    {O,O3} = reconcile_test(),
  -    O3 = riak_object:syntactic_merge(O,O3),
  -    {O,O3}.
  -
  -merge2_test() ->
  -    B = <<"buckets_are_binaries">>,
  -    K = <<"keys are binaries">>,
  -    V = <<"testvalue2">>,
  -    O1 = riak_object:increment_vclock(object_test(), node1),
  -    O2 = riak_object:increment_vclock(riak_object:new(B,K,V), node2),
  -    O3 = riak_object:syntactic_merge(O1, O2),
  -    [node1, node2] = [N || {N,_} <- riak_object:vclock(O3)],
  -    2 = riak_object:value_count(O3).
  -
  -merge3_test() ->
  +merge4_test() ->
       O0 = riak_object:new(<<"test">>, <<"test">>, hi),
       O1 = riak_object:increment_vclock(O0, x),
       ?assertEqual(O1, riak_object:syntactic_merge(O1, O1)).
   
  -merge4_test() ->
  +merge5_test() ->
       O0 = riak_object:new(<<"test">>, <<"test">>, hi),
       O1 = riak_object:increment_vclock(
              riak_object:update_value(O0, bye), x),
  
positive.code:     ?assertEqual(OM, OMp), %% merge should be symmetric here
      {O0, O1}.
  
  merge5_test() ->
      B = <<"buckets_are_binaries">>,
      K = <<"keys are binaries">>,
      V = <<"testvalue2">>,
      O1 = riak_object:increment_vclock(object_test(), node1),
      O2 = riak_object:increment_vclock(riak_object:new(B,K,V), node2),
      ?assertEqual(riak_object:syntactic_merge(O1, O2),
                   riak_object:syntactic_merge(O2, O1)).
  
  equality1_test() ->
      MD0 = dict:new(),
      MD = dict:store("X-Riak-Test", "value", MD0),
  
negative.code:     catch throw:{error, key_too_large} ->
              ok
      end.
  
  get_update_value_test() ->
      O = riak_object:new(<<"test">>, <<"test">>, old_val),
  