       {:error, _} -> nil
     end
 
-    {:ok, pid: pid, email: email}
+    {:ok, email: email}
   end
 
+  test "account creation messaging", %{email: email} do
+    service = :account_broker_tests_01
+    {:ok, pid} = Tester.start_link(service, self())
 
-  test "account creation messaging", %{pid: pid, email: email} do
     # This tester listens to event:acount:created casts
-    Tester.listen(pid, :cast, :test_account_creation1, "event:account:created")
+    Tester.listen(pid, :cast, "event:account:created")
 
     # Example account payload
     account = %{

    assert String.length(account_id) == 25

    # Assert that message was received
    assert_receive {:cast, "event:account:created"}

    # Assert that the state was saved
    {:ok, event_accound_id} = Tester.assert(pid, :cast, "event:account:created")

  setup do
    {:ok, _} = Application.ensure_all_started(:helf_router)
    {:ok, _} = Application.ensure_all_started(:helf_broker)

    # account email
    email = "account@test02.com"

    # remove existing user
    case HELM.Account.Controller.find(email) do
