Index: tests/conftest.py
===================================================================
--- tests/conftest.py	(revision 8a238e28c780bde8e5a96789d161e9e73eff0429)
+++ tests/conftest.py	(revision 2f650ac2e7785d9119d1bf6cc71d62a5397f183a)
@@ -3,5 +3,5 @@
 import pytest
 import json
-from flexoentity import FlexoEntity, EntityType, EntityState
+from flexoentity import FlexoEntity, EntityType, EntityState, Domain
 
 
@@ -34,5 +34,5 @@
     """Generic FlexoEntity-like instance in draft state."""
     return DummyEntity(
-        domain="AF",
+        domain=Domain(domain="SIG", etype=EntityType.DOMAIN, state=EntityState.DRAFT, fullname="Signal Corps", classification="RESTRICTED"),
         etype=EntityType.CATALOG,
         state=EntityState.DRAFT,
Index: tests/test_id_stress.py
===================================================================
--- tests/test_id_stress.py	(revision 8a238e28c780bde8e5a96789d161e9e73eff0429)
+++ tests/test_id_stress.py	(revision 2f650ac2e7785d9119d1bf6cc71d62a5397f183a)
@@ -6,5 +6,5 @@
 import random
 
-from flexoentity import FlexOID, EntityType, EntityState
+from flexoentity import FlexOID, EntityType, EntityState, Domain
 
 from tests.conftest import DummyEntity
@@ -13,5 +13,7 @@
 def test_bulk_generation_uniqueness():
     """Generate 10,000 IDs and assert uniqueness (statistical test)."""
-    domain = "AF"
+    domain = Domain(domain="SIG", etype=EntityType.DOMAIN, state=EntityState.DRAFT,
+                    fullname="Signal Corps", classification="RESTRICTED", owner="MESE")
+
     etype = EntityType.QUESTION
     estate = EntityState.DRAFT
@@ -44,5 +46,6 @@
     should yield the same base ID (without suffix).
     """
-    domain = "AF"
+    domain = Domain(domain="SIG", etype=EntityType.DOMAIN, state=EntityState.DRAFT,
+                    fullname="Signal Corps", classification="RESTRICTED")
     etype = EntityType.CATALOG
     estate = EntityState.DRAFT