diff --git a/test/controllers/boards/columns_controller_test.rb b/test/controllers/boards/columns_controller_test.rb
index 5fa4cebaf..afce7d5dc 100644
--- a/test/controllers/boards/columns_controller_test.rb
+++ b/test/controllers/boards/columns_controller_test.rb
@@ -19,14 +19,14 @@ class Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest
     assert_equal "New Column", boards(:writebook).columns.last.name
   end
 
-  test "create refreshes surrounding columns" do
+  test "create refreshes adjacent columns" do
     board = boards(:writebook)
 
     post board_columns_path(board), params: { column: { name: "New Column" } }, as: :turbo_stream
 
     new_column = board.columns.find_by!(name: "New Column")
-    new_column.surroundings.each do |column|
-      assert_turbo_stream action: :replace, target: dom_id(column)
+    new_column.adjacent_columns.each do |adjacent_column|
+      assert_turbo_stream action: :replace, target: dom_id(adjacent_column)
     end
   end
 
@@ -49,15 +49,16 @@ class Boards::ColumnsControllerTest < ActionDispatch::IntegrationTest
   end
 
 
-  test "destroy refreshes surrounding columns" do
+  test "destroy refreshes adjacent columns" do
     column = columns(:writebook_in_progress)
-    surroundings = column.surroundings.to_a
+    adjacent_columns = column.adjacent_columns.to_a
 
     delete board_column_path(column.board, column), as: :turbo_stream
 
-    surroundings.each do |surrounding|
-      assert_turbo_stream action: :replace, target: dom_id(surrounding)
+    adjacent_columns.each do |adjacent_column|
+      assert_turbo_stream action: :replace, target: dom_id(adjacent_column)
     end
+  end
 
   test "index as JSON" do
     board = boards(:writebook)
diff --git a/test/controllers/columns/left_positions_controller_test.rb b/test/controllers/columns/left_positions_controller_test.rb
index cce5b67ef..6c807b0e5 100644
--- a/test/controllers/columns/left_positions_controller_test.rb
+++ b/test/controllers/columns/left_positions_controller_test.rb
@@ -21,13 +21,13 @@ class Columns::LeftPositionsControllerTest < ActionDispatch::IntegrationTest
     assert_equal original_position_a, column_b.reload.position
   end
 
-  test "move left refreshes surrounding columns" do
+  test "move left refreshes adjacent columns" do
     column = columns(:writebook_in_progress)
 
     post column_left_position_path(column), as: :turbo_stream
 
-    column.reload.surroundings.each do |surrounding|
-      assert_turbo_stream action: :replace, target: dom_id(surrounding)
+    column.reload.adjacent_columns.each do |adjacent_column|
+      assert_turbo_stream action: :replace, target: dom_id(adjacent_column)
     end
   end
 
diff --git a/test/controllers/columns/right_positions_controller_test.rb b/test/controllers/columns/right_positions_controller_test.rb
index 16c3ebba9..c927531be 100644
--- a/test/controllers/columns/right_positions_controller_test.rb
+++ b/test/controllers/columns/right_positions_controller_test.rb
@@ -21,13 +21,13 @@ class Columns::RightPositionsControllerTest < ActionDispatch::IntegrationTest
     assert_equal original_position_a, column_b.reload.position
   end
 
-  test "move right refreshes surrounding columns" do
+  test "move right refreshes adjacent columns" do
     column = columns(:writebook_in_progress)
 
     post column_right_position_path(column), as: :turbo_stream
 
-    column.reload.surroundings.each do |surrounding|
-      assert_turbo_stream action: :replace, target: dom_id(surrounding)
+    column.reload.adjacent_columns.each do |adjacent_column|
+      assert_turbo_stream action: :replace, target: dom_id(adjacent_column)
     end
   end
 
diff --git a/test/models/column/positioned_test.rb b/test/models/column/positioned_test.rb
index 4ef910977..3cd66e314 100644
--- a/test/models/column/positioned_test.rb
+++ b/test/models/column/positioned_test.rb
@@ -59,34 +59,4 @@ class Column::PositionedTest < ActiveSupport::TestCase
 
     assert_equal original_position, rightmost_column.reload.position
   end
-
-  test "creating a column touches surrounding columns" do
-    board = boards(:writebook)
-    column = board.columns.sorted.last
-    original_updated_at = column.updated_at
-
-    travel 1.second do
-      board.columns.create!(name: "New Column")
-    end
-
-    assert_operator column.reload.updated_at, :>, original_updated_at
-  end
-
-  test "destroying a column touches surrounding columns" do
-    board = boards(:writebook)
-    columns = board.columns.sorted.to_a
-    column_to_destroy = columns[1]
-    left_neighbor = columns[0]
-    right_neighbor = columns[2]
-
-    original_left_updated_at = left_neighbor.updated_at
-    original_right_updated_at = right_neighbor.updated_at
-
-    travel 1.second do
-      column_to_destroy.destroy
-    end
-
-    assert_operator left_neighbor.reload.updated_at, :>, original_left_updated_at
-    assert_operator right_neighbor.reload.updated_at, :>, original_right_updated_at
-  end
 end