diff --git a/test/end_to_end/iterator_SUITE.erl b/test/end_to_end/iterator_SUITE.erl
index 8ec9312..5d9aa28 100644
--- a/test/end_to_end/iterator_SUITE.erl
+++ b/test/end_to_end/iterator_SUITE.erl
@@ -529,30 +529,31 @@ multibucket_fold(_Config) ->
          end,
     FoldAccT = {FF, []},
 
-    {async, R1} = leveled_bookie:book_headfold(Bookie1,
-                                               ?RIAK_TAG,
-                                               {bucket_list, 
-                                                [{<<"Type1">>, <<"Bucket1">>}, 
-                                                    {<<"Type2">>, <<"Bucket4">>}]},
-                                               FoldAccT,
-                                               false,
-                                               true,
-                                               false),
+    {async, R1} = 
+        leveled_bookie:book_headfold(Bookie1,
+                                        ?RIAK_TAG,
+                                        {bucket_list, 
+                                        [{<<"Type1">>, <<"Bucket1">>}, 
+                                            {<<"Type2">>, <<"Bucket4">>}]},
+                                        FoldAccT,
+                                        false,
+                                        true,
+                                        false),
 
     O1 = length(R1()),
     io:format("Result R1 of length ~w~n", [O1]),
     
-    Q2 = {foldheads_bybucket,
-                ?RIAK_TAG, 
-                [<<"Bucket2">>, <<"Bucket3">>], bucket_list,
-                {fun(_B, _K, _PO, Acc) ->
-                        Acc +1
-                    end,
-                    0},
-                false, 
-                true, 
-                false},
-    {async, R2} = leveled_bookie:book_returnfolder(Bookie1, Q2),
+    {async, R2} = 
+        leveled_bookie:book_headfold(Bookie1,
+                                        ?RIAK_TAG,
+                                        {bucket_list, 
+                                            [<<"Bucket2">>, 
+                                                <<"Bucket3">>]},
+                                        {fun(_B, _K, _PO, Acc) ->
+                                                Acc +1
+                                            end,
+                                            0},
+                                        false, true, false),
     O2 = R2(),
     io:format("Result R2 of ~w~n", [O2]),
 
diff --git a/test/end_to_end/riak_SUITE.erl b/test/end_to_end/riak_SUITE.erl
index 0482bd5..0ce737f 100644
--- a/test/end_to_end/riak_SUITE.erl
+++ b/test/end_to_end/riak_SUITE.erl
@@ -182,7 +182,7 @@ test_singledelta_stores(BookA, BookB, TreeSize, DeltaKey) ->
                 all, 
                 {fun head_tictac_foldfun/4, 
                     {0, leveled_tictac:new_tree(test, TreeSize)}},
-                false, false, false},
+                false, false, false, false, false},
 
     DLs = check_tictacfold(BookA, BookB, 
                             TicTacFolder, 
diff --git a/test/end_to_end/tictac_SUITE.erl b/test/end_to_end/tictac_SUITE.erl
index 5a22abe..690160d 100644
--- a/test/end_to_end/tictac_SUITE.erl
+++ b/test/end_to_end/tictac_SUITE.erl
@@ -156,14 +156,15 @@ many_put_compare(_Config) ->
                 [timer:now_diff(os:timestamp(), SWB0Obj)]),
     true = length(leveled_tictac:find_dirtyleaves(TreeA, TreeAObj0)) == 0,
 
-    FoldQ1 = {foldheads_bybucket,
-              o_rkv,
-              "Bucket",
-              all,
-              {FoldObjectsFun, leveled_tictac:new_tree(0, TreeSize)},
-              true, true, false},
+    InitAccTree = leveled_tictac:new_tree(0, TreeSize),
+    
     {async, TreeAObjFolder1} =
-        leveled_bookie:book_returnfolder(Bookie2, FoldQ1),
+        leveled_bookie:book_headfold(Bookie2, 
+                                        ?RIAK_TAG,
+                                        {range, "Bucket", all},
+                                        {FoldObjectsFun, 
+                                            InitAccTree},
+                                        true, true, false),
     SWB1Obj = os:timestamp(),
     TreeAObj1 = TreeAObjFolder1(),
     io:format("Build tictac tree via object fold with "++
@@ -184,21 +185,26 @@ many_put_compare(_Config) ->
         fun(_Bucket, Key, Value, Acc) ->
             leveled_tictac:add_kv(Acc, Key, Value, AltExtractFun)
         end,
-    AltFoldQ0 = {foldheads_bybucket,
-                    o_rkv,
-                    "Bucket",
-                    all,
-                    {AltFoldObjectsFun, leveled_tictac:new_tree(0, TreeSize)},
-                    false, true, false},
+    
     {async, TreeAAltObjFolder0} =
-        leveled_bookie:book_returnfolder(Bookie2, AltFoldQ0),
+        leveled_bookie:book_headfold(Bookie2, 
+                                        ?RIAK_TAG,
+                                        {range, "Bucket", all},
+                                        {AltFoldObjectsFun, 
+                                            InitAccTree},
+                                        false, true, false),
     SWB2Obj = os:timestamp(),
     TreeAAltObj = TreeAAltObjFolder0(),
     io:format("Build tictac tree via object fold with no "++
                     "presence check and 200K objects  and alt hash in ~w~n",
                 [timer:now_diff(os:timestamp(), SWB2Obj)]),
     {async, TreeBAltObjFolder0} =
-        leveled_bookie:book_returnfolder(Bookie3, AltFoldQ0),
+        leveled_bookie:book_headfold(Bookie3, 
+                                        ?RIAK_TAG,
+                                        {range, "Bucket", all},
+                                        {AltFoldObjectsFun, 
+                                            InitAccTree},
+                                        false, true, false),
     SWB3Obj = os:timestamp(),
     TreeBAltObj = TreeBAltObjFolder0(),
     io:format("Build tictac tree via object fold with no "++