diff --git a/backlog/tasks/ml-182.3 - Wave-3-Convert-live-2-→-visit-2-for-CRUD-LiveViews-6-files.md b/backlog/tasks/ml-182.3 - Wave-3-Convert-live-2-→-visit-2-for-CRUD-LiveViews-6-files.md
index 44bd35df..ff2f0678 100644
--- a/backlog/tasks/ml-182.3 - Wave-3-Convert-live-2-→-visit-2-for-CRUD-LiveViews-6-files.md	
+++ b/backlog/tasks/ml-182.3 - Wave-3-Convert-live-2-→-visit-2-for-CRUD-LiveViews-6-files.md	
@@ -4,6 +4,7 @@ title: "Wave 3: Convert live/2 → visit/2 for CRUD LiveViews (6 files)"
 status: In Progress
 assignee: []
 created_date: "2026-05-14 22:14"
+updated_date: "2026-05-15 05:46"
 labels:
   - testing
   - refactoring
@@ -28,8 +29,8 @@ Convert `live/2` → `visit/2` for standard CRUD LiveViews. Files:
 
 - **maintenance_live/index_test.exs** ✅ Done (14 tests pass) — all `live/2` → `visit/2`, `render_click/3` → `click_button/2` with scoped selectors for duplicate button texts. External redirect test simplified. Kept `unwrap(&render_async/1)` for async status tests.
 - **online_store_template_live/index_test.exs** ✅ Done (7 tests pass) — mixed `visit/2` and `live/2` eliminated. Field labels: "Template Name", "URL Template". Buttons: "Save Template", "Delete", "Disable/Enable template".
-- **record_set_live/index_test.exs** ⏸️ Needs form label inspection — likely "Name" field, "Save" button.
-- **record_set_live/show_test.exs** ⏸️ Complex: add-record modal with `phx-target`, `trigger_hook` for drag-and-drop, delete/remove buttons in dropdown menus. Need to inspect templates for exact button texts.
+- **record_set_live/index_test.exs** ✅ Done (7 tests pass) — removed `import Phoenix.LiveViewTest`. Create/Edit: `live/2` + `form/3` + `render_submit/1` → `visit/2` + `fill_in/3` + `click_button/2`. Validation: `live/2` + `form/3` + `render_change/1` → `visit/2` + `click_button/2` + `assert_has("[data-part='error']", ...)`. Ordering test: `live/2` → `visit/2` + `Phoenix.LiveViewTest.render(session.view)`. Button text: "Save Set", field label: "Name".
+- **record_set_live/show_test.exs** ✅ Done (15 tests pass) — removed `import Phoenix.LiveViewTest`, replaced with explicit `only:` for `render_click/1, render_hook/3, render_submit/1, element/2, form/3`. Remove record: `click_button("button[...]", "Remove")`. Delete set: `click_button("button[phx-click='delete_set']", "Delete")` + `assert_path`. Reorder: `unwrap(&render_hook/3)`. Picker search: `search_picker` helper uses `unwrap` with `form/3` + `render_submit/1`. Add record: `unwrap` with `element/2` + `render_click/1` on `<li phx-click='add_record'>`. Result checks use `assert_has`/`refute_has` instead of `=~` and `has_element?`.
 - **scrobble_rules_live/index_test.exs** ⏸️ Needs form label inspection — "Match Value", "Target MusicBrainz ID", "Type" select, "Save" button.
 - **scrobbled_tracks_live/rule_picker_test.exs** ⏸️ Blocked: clicks `<span>` badges with `phx-click` (Fluxon). PhoenixTest only supports `<a>` and `<button>`.
 
@@ -39,4 +40,7 @@ Key learnings for remaining files:
 - Fluxon labels without separate visible text don't work with `fill_in` — visit with query params instead
 - `trigger_hook` in PhoenixTest expects JSON-encoded values
 - LiveComponent modals with `phx-target` need form interaction, not URL params
+- For position-based assertions (ordering), use `Phoenix.LiveViewTest.render(session.view)` to get raw HTML
+- `<li phx-click>` needs `unwrap` with `element/2` + `render_click/1` since PhoenixTest only supports `<a>` and `<button>` natively
+- Forms inside LiveComponents (phx-target={@myself}) with no visible label on inputs need `unwrap` with `form/3` + `render_submit/1` for search/submit operations
 <!-- SECTION:DESCRIPTION:END -->
diff --git a/test/music_library_web/live/record_set_live/show_test.exs b/test/music_library_web/live/record_set_live/show_test.exs
index f00b768e..e27c368f 100644
--- a/test/music_library_web/live/record_set_live/show_test.exs
+++ b/test/music_library_web/live/record_set_live/show_test.exs
@@ -3,7 +3,15 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
 
   import MusicLibrary.Fixtures.RecordSets
   import MusicLibrary.Fixtures.Records, only: [record: 1]
-  import Phoenix.LiveViewTest
+
+  import Phoenix.LiveViewTest,
+    only: [
+      render_click: 1,
+      render_hook: 3,
+      render_submit: 1,
+      element: 2,
+      form: 3
+    ]
 
   alias MusicLibrary.RecordSets
 
@@ -54,16 +62,16 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
     test "removes a record from the set", %{conn: conn} do
       {set, [r1 | _]} = record_set_with_records(2)
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}")
-
-      view
-      |> element("button[phx-click='remove_record'][phx-value-record-id='#{r1.id}']")
-      |> render_click()
-
-      refute has_element?(
-               view,
-               "button[phx-click='remove_record'][phx-value-record-id='#{r1.id}']"
-             )
+      conn
+      |> visit(~p"/record-sets/#{set}")
+      |> click_button(
+        "button[phx-click='remove_record'][phx-value-record-id='#{r1.id}']",
+        "Remove"
+      )
+      |> refute_has(
+        "button[phx-click='remove_record'][phx-value-record-id='#{r1.id}']",
+        "Remove"
+      )
     end
   end
 
@@ -71,9 +79,9 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
     test "reorders records via reorder event", %{conn: conn} do
       {set, [r1, r2, r3]} = record_set_with_records(3)
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}")
+      session = conn |> visit(~p"/record-sets/#{set}")
 
-      render_hook(view, "reorder", %{"record_ids" => [r3.id, r1.id, r2.id]})
+      unwrap(session, &render_hook(&1, "reorder", %{"record_ids" => [r3.id, r1.id, r2.id]}))
 
       updated = RecordSets.get_record_set!(set.id)
       ids_in_order = Enum.map(updated.items, & &1.record.id)
@@ -85,13 +93,10 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
     test "deletes set and navigates to index", %{conn: conn} do
       set = record_set(%{name: "To Delete"})
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}")
-
-      view
-      |> element("button[phx-click='delete_set']")
-      |> render_click()
-
-      assert_redirect(view, ~p"/record-sets")
+      conn
+      |> visit(~p"/record-sets/#{set}")
+      |> click_button("button[phx-click='delete_set']", "Delete")
+      |> assert_path(~p"/record-sets")
     end
   end
 
@@ -121,47 +126,53 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
       set = record_set()
       collected = record(%{title: "Collected Unique Xyzzy", purchased_at: DateTime.utc_now()})
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}/show/add-record")
+      session =
+        conn
+        |> visit(~p"/record-sets/#{set}/show/add-record")
+        |> search_picker("Xyzzy")
 
-      html = search_picker(view, "Xyzzy")
-
-      assert html =~ "Collected"
-      assert html =~ escape(collected.title)
+      assert_has(session, "h3", "Collected")
+      assert_has(session, "p", collected.title)
     end
 
     test "shows wishlisted records matching the query", %{conn: conn} do
       set = record_set()
       wishlisted = record(%{title: "Wishlisted Unique Xyzzy", purchased_at: nil})
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}/show/add-record")
+      session =
+        conn
+        |> visit(~p"/record-sets/#{set}/show/add-record")
+        |> search_picker("Xyzzy")
 
-      html = search_picker(view, "Xyzzy")
-
-      assert html =~ "Wishlisted"
-      assert html =~ escape(wishlisted.title)
+      assert_has(session, "h3", "Wishlisted")
+      assert_has(session, "p", wishlisted.title)
     end
 
     test "shows 'No records found' for non-matching queries", %{conn: conn} do
       set = record_set()
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}/show/add-record")
+      session =
+        conn
+        |> visit(~p"/record-sets/#{set}/show/add-record")
+        |> search_picker("NonexistentTitleZzzzzzzz")
 
-      html = search_picker(view, "NonexistentTitleZzzzzzzz")
-
-      assert html =~ "No records found"
+      assert_has(session, "p", "No records found")
     end
 
     test "adds a record to the set", %{conn: conn} do
       set = record_set()
       picked = record(%{title: "Pickable Unique Xyzzy", purchased_at: DateTime.utc_now()})
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}/show/add-record")
+      session =
+        conn
+        |> visit(~p"/record-sets/#{set}/show/add-record")
+        |> search_picker("Xyzzy")
 
-      search_picker(view, "Xyzzy")
-
-      view
-      |> element("li[phx-click='add_record'][phx-value-record-id='#{picked.id}']")
-      |> render_click()
+      unwrap(session, fn view ->
+        view
+        |> element("li[phx-click='add_record'][phx-value-record-id='#{picked.id}']")
+        |> render_click()
+      end)
 
       updated = RecordSets.get_record_set!(set.id)
       assert Enum.any?(updated.items, fn item -> item.record.id == picked.id end)
@@ -172,20 +183,23 @@ defmodule MusicLibraryWeb.RecordSetLive.ShowTest do
       existing = record(%{title: "Already In Set Xyzzy", purchased_at: DateTime.utc_now()})
       {:ok, _} = RecordSets.add_record_to_set(set, existing.id)
 
-      {:ok, view, _html} = live(conn, ~p"/record-sets/#{set}/show/add-record")
+      session =
+        conn
+        |> visit(~p"/record-sets/#{set}/show/add-record")
+        |> search_picker("Xyzzy")
 
-      search_picker(view, "Xyzzy")
-
-      refute has_element?(
-               view,
-               "li[phx-click='add_record'][phx-value-record-id='#{existing.id}']"
-             )
+      refute_has(
+        session,
+        "li[phx-click='add_record'][phx-value-record-id='#{existing.id}']"
+      )
     end
   end
 
-  defp search_picker(view, query) do
-    view
-    |> form("#record-picker-navigation form", %{query: query})
-    |> render_submit()
+  defp search_picker(session, query) do
+    unwrap(session, fn view ->
+      view
+      |> form("#record-picker-navigation form", %{query: query})
+      |> render_submit()
+    end)
   end
 end