     assert entity.account_id == account_id
   end
 
-  test "direct entity creation", %{pid: pid, payload: payload} do
+  test "direct entity creation", %{puuid: puuid} do
+    service = :entity_broker_tests_02
+    {:ok, pid} = Tester.start_link(service, self())
+
     # This tester listens to event:acount:created casts
-    Tester.listen(pid, :cast, :test_entity_creation2, "event:account:created")
-    Tester.listen(pid, :cast, :test_entity_creation2, "event:entity:created")
+    Tester.listen(pid, :cast, "event:account:created")
+    Tester.listen(pid, :cast, "event:entity:created")
 
     # Try to create the user
-    {:ok, entity} = Broker.call("entity:create", %{account_id: payload.email})
+    {:ok, entity} = Broker.call("entity:create", %{account_id: puuid})
 
     # cache the account id
     entity_id = entity.entity_id

defmodule HELM.Entity.BrokerTest do
  use ExUnit.Case, async: false

  require Logger



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

    # account email
    email = "entity@test01.com"
    puuid = "pseudo-uuid"

    with {:ok, account} <- Account.Controller.find(email),
         Account.Controller.remove_account(account),
         {:ok, entity} <- Entity.Controller.find_by(account_id: account.account_id),
      do: Entity.Controller.remove_entity(entity)

    with {:ok, entity} <- Entity.Controller.find_by(account_id: puuid),
      do: Entity.Controller.remove_entity(entity)

    payload = %{
