diff --git a/test/mv_web/member_live/index_test.exs b/test/mv_web/member_live/index_test.exs
index 0bcc731..9e3323f 100644
--- a/test/mv_web/member_live/index_test.exs
+++ b/test/mv_web/member_live/index_test.exs
@@ -285,14 +285,9 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select two members
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']")
-      |> render_click()
-
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member2.id}']")
-      |> render_click()
+      # Select two members by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member1.id})
+      render_click(view, "select_member", %{"id" => member2.id})
 
       # Trigger copy_emails event
       view |> element("#copy-emails-btn") |> render_click()
@@ -336,10 +331,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select member with umlauts
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member3.id}']")
-      |> render_click()
+      # Select member with umlauts by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member3.id})
 
       # Trigger copy_emails event - should not crash
       view |> element("#copy-emails-btn") |> render_click()
@@ -355,10 +348,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select a member
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']")
-      |> render_click()
+      # Select a member by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member1.id})
 
       # Delete the member from the database
       Ash.destroy!(member1)
@@ -379,14 +370,9 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select two members
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']")
-      |> render_click()
-
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member2.id}']")
-      |> render_click()
+      # Select two members by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member1.id})
+      render_click(view, "select_member", %{"id" => member2.id})
 
       # Get the socket state to verify the formatted email string
       state = :sys.get_state(view.pid)
@@ -415,10 +401,8 @@ defmodule MvWeb.MemberLive.IndexTest do
 
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select the test member
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{test_member.id}']")
-      |> render_click()
+      # Select the test member by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => test_member.id})
 
       # The format should be "Test Format <test.format@example.com>"
       # We verify this by checking the flash shows 1 email was copied
@@ -441,10 +425,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select a member
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']")
-      |> render_click()
+      # Select a member by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member1.id})
 
       # Button should now be visible
       assert has_element?(view, "#copy-emails-btn")
@@ -457,10 +439,8 @@ defmodule MvWeb.MemberLive.IndexTest do
       conn = conn_with_oidc_user(conn)
       {:ok, view, _html} = live(conn, "/members")
 
-      # Select a member
-      view
-      |> element("[phx-click='select_member'][phx-value-id='#{member1.id}']")
-      |> render_click()
+      # Select a member by sending the select_member event directly
+      render_click(view, "select_member", %{"id" => member1.id})
 
       # Click copy button
       view |> element("#copy-emails-btn") |> render_click()