2 files changed, 9 insertions, 8 deletions

diff --git a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
index 8b21952b2d1..64cb6a6c146 100644
--- a/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
+++ b/searchlib/src/tests/tensor/direct_tensor_store/direct_tensor_store_test.cpp
@@ -107,7 +107,7 @@ TEST_F(DirectTensorStoreTest, hold_adds_entry_to_hold_list)
     EXPECT_GT(mem_2.allocatedBytesOnHold(), mem_1.allocatedBytesOnHold() + tensor_mem_usage.allocatedBytes());
 }
 
-TEST_F(DirectTensorStoreTest, move_allocates_new_entry_and_puts_old_entry_on_hold)
+TEST_F(DirectTensorStoreTest, move_on_compact_allocates_new_entry_and_leaves_old_entry_alone)
 {
     auto t = make_tensor(5);
     auto* exp = t.get();
@@ -115,12 +115,13 @@ TEST_F(DirectTensorStoreTest, move_allocates_new_entry_and_puts_old_entry_on_hol
     auto ref_1 = store.store_tensor(std::move(t));
     auto mem_1 = store.getMemoryUsage();
 
-    auto ref_2 = store.move(ref_1);
+    auto ref_2 = store.move_on_compact(ref_1);
     auto mem_2 = store.getMemoryUsage();
     EXPECT_NE(ref_1, ref_2);
     expect_tensor(exp, ref_1);
     expect_tensor(exp, ref_2);
-    EXPECT_GT(mem_2.allocatedBytesOnHold(), mem_1.allocatedBytesOnHold() + tensor_mem_usage.allocatedBytes());
+    EXPECT_EQ(0, mem_2.allocatedBytesOnHold());
+    EXPECT_GT(mem_2.usedBytes(), mem_1.usedBytes() + tensor_mem_usage.allocatedBytes());
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchlib/src/tests/tensor/tensor_buffer_store/tensor_buffer_store_test.cpp b/searchlib/src/tests/tensor/tensor_buffer_store/tensor_buffer_store_test.cpp
index 101b84e01aa..3bbb6cd334e 100644
--- a/searchlib/src/tests/tensor/tensor_buffer_store/tensor_buffer_store_test.cpp
+++ b/searchlib/src/tests/tensor/tensor_buffer_store/tensor_buffer_store_test.cpp
@@ -29,7 +29,7 @@ protected:
     vespalib::nbostream encode_stored_tensor(EntryRef ref);
     void assert_store_load(const TensorSpec& tensor_spec);
     void assert_store_load_many(const TensorSpec& tensor_spec);
-    void assert_store_move_load(const TensorSpec& tensor_spec);
+    void assert_store_move_on_compact_load(const TensorSpec& tensor_spec);
     void assert_store_encode_store_encoded_load(const TensorSpec& tensor_spec);
 };
 
@@ -102,10 +102,10 @@ TensorBufferStoreTest::assert_store_load_many(const TensorSpec& tensor_spec)
 }
 
 void
-TensorBufferStoreTest::assert_store_move_load(const TensorSpec& tensor_spec)
+TensorBufferStoreTest::assert_store_move_on_compact_load(const TensorSpec& tensor_spec)
 {
     auto ref = store_tensor(tensor_spec);
-    auto ref2 = _store.move(ref);
+    auto ref2 = _store.move_on_compact(ref);
     EXPECT_NE(ref, ref2);
     auto loaded_spec = load_tensor_spec(ref2);
     _store.holdTensor(ref2);
@@ -147,10 +147,10 @@ TEST_F(TensorBufferStoreTest, tensor_can_be_stored_and_loaded_many_times)
     }
 }
 
-TEST_F(TensorBufferStoreTest, stored_tensor_can_be_copied)
+TEST_F(TensorBufferStoreTest, stored_tensor_can_be_moved_on_compact)
 {
     for (auto& tensor_spec : tensor_specs) {
-        assert_store_move_load(tensor_spec);
+        assert_store_move_on_compact_load(tensor_spec);
     }
 }