1 files changed, 8 insertions, 4 deletions
diff --git a/storage/src/tests/distributor/distributortestutil.cpp b/storage/src/tests/distributor/distributortestutil.cpp
index e92ba0374bc..a2f32d8faa2 100644
--- a/storage/src/tests/distributor/distributortestutil.cpp
+++ b/storage/src/tests/distributor/distributortestutil.cpp
@@ -295,7 +295,7 @@ DistributorTestUtil::insertBucketInfo(document::BucketId id,
     if (active) {
         info2.setActive();
     }
-    BucketCopy copy(distributor_component().getUniqueTimestamp(), node, info2);
+    BucketCopy copy(operation_context().generate_unique_timestamp(), node, info2);
 
     entry->addNode(copy.setTrusted(trusted), toVector<uint16_t>(0));
 
@@ -355,9 +355,8 @@ DistributorTestUtil::getExternalOperationHandler() {
     return _distributor->external_operation_handler();
 }
 
-storage::distributor::DistributorStripeComponent&
-DistributorTestUtil::distributor_component() {
-    // TODO STRIPE tests use this to indirectly access bucket space repos/DBs!
+const storage::distributor::DistributorNodeContext&
+DistributorTestUtil::node_context() const {
     return _distributor->distributor_component();
 }
 
@@ -366,6 +365,11 @@ DistributorTestUtil::operation_context() {
     return _distributor->distributor_component();
 }
 
+const DocumentSelectionParser&
+DistributorTestUtil::doc_selection_parser() const {
+    return _distributor->distributor_component();
+}
+
 bool
 DistributorTestUtil::tick() {
     framework::ThreadWaitInfo res(