       password_confirmation: "12345678"
     }
 
-    {:ok, pid: pid, payload: payload}
+    {:ok, payload: payload, puuid: puuid}
   end
 
-  test "entity creation from account", %{pid: pid, payload: payload} do
+  test "entity creation from account", %{payload: payload} do
+    service = :entity_broker_tests_01
+    {:ok, pid} = Tester.start_link(service, self())
+
     # This tester listens to event:acount:created casts
-    Tester.listen(pid, :cast, :test_entity_creation1, "event:account:created")
-    Tester.listen(pid, :cast, :test_entity_creation1, "event:entity:created")
+    Tester.listen(pid, :cast, "event:account:created")
+    Tester.listen(pid, :cast, "event:entity:created")
 
     # Try to create the user
     {:ok, _} = Broker.call("account:create", payload)
 
     # Assert that account created event was received
-    assert_receive {:cast, "event:account:created"}
+    assert_receive {:cast, service, "event:account:created"}
 
     # Assert that the account_id saved
     {:ok, account_id} = Tester.assert(pid, :cast, "event:account:created")
 
     # Assert that account created event was received
-    assert_receive {:cast, "event:entity:created"}
+    assert_receive {:cast, service, "event:entity:created"}
 
     # Assert that the entity_id was saved
     {:ok, entity_id} = Tester.assert(pid, :cast, "event:entity:created")

    assert String.length(entity_id) == 25

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

    # Assert that the entity_id was saved
    {:ok, event_entity_id} = Tester.assert(pid, :cast, "event:entity:created")


  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 = %{
