diff --git a/ensysmod/crud/base_depends_dataset.py b/ensysmod/crud/base_depends_dataset.py
index 6a906b3..48e760e 100644
--- a/ensysmod/crud/base_depends_dataset.py
+++ b/ensysmod/crud/base_depends_dataset.py
@@ -19,5 +19,6 @@ def get_multi_by_dataset(
 
     def get_by_dataset_and_name(self, db: Session, *, dataset_id: int, name: str) -> Optional[ModelType]:
         return db.query(self.model) \
-            .filter(self.model.name == name and self.model.ref_dataset == dataset_id) \
+            .filter(self.model.name == name) \
+            .filter(self.model.ref_dataset == dataset_id) \
             .first()
diff --git a/ensysmod/crud/base_depends_timeseries.py b/ensysmod/crud/base_depends_timeseries.py
index 3794757..cb77aa7 100644
--- a/ensysmod/crud/base_depends_timeseries.py
+++ b/ensysmod/crud/base_depends_timeseries.py
@@ -19,7 +19,8 @@ def get_by_component(self, db: Session, *, component_id: int) -> Optional[List[M
 
     def get_by_component_and_region(self, db: Session, *, component_id: int, region_id: int) -> Optional[ModelType]:
         return db.query(self.model) \
-            .filter(self.model.ref_component == component_id and self.model.ref_region == region_id) \
+            .filter(self.model.ref_component == component_id) \
+            .filter(self.model.ref_region == region_id) \
             .first()
 
     def create(self, db: Session, *, obj_in: CreateSchemaType) -> ModelType:
diff --git a/tests/utils/data_generator/energy_conversions.py b/tests/utils/data_generator/energy_conversions.py
index f2ba772..57315d1 100644
--- a/tests/utils/data_generator/energy_conversions.py
+++ b/tests/utils/data_generator/energy_conversions.py
@@ -3,9 +3,8 @@
 from ensysmod import crud
 from ensysmod.model import EnergyConversion
 from ensysmod.schemas import EnergyConversionCreate
-from tests.utils.data_generator.datasets import random_existing_dataset, fixed_existing_dataset
-from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity, \
-    fixed_existing_energy_commodity
+from tests.utils.data_generator.datasets import fixed_existing_dataset
+from tests.utils.data_generator.energy_commodities import fixed_existing_energy_commodity
 from tests.utils.utils import random_lower_string
 
 
@@ -13,8 +12,8 @@ def random_energy_conversion_create(db: Session) -> EnergyConversionCreate:
     """
     Generate a random EnergyConversionCreate object.
     """
-    dataset = random_existing_dataset(db)
-    commodity = random_existing_energy_commodity(db)
+    dataset = fixed_existing_dataset(db)
+    commodity = fixed_existing_energy_commodity(db)
     return EnergyConversionCreate(
         ref_dataset=dataset.id,
         name=f"EnergyConversion-{dataset.id}-{random_lower_string()}",
diff --git a/tests/utils/data_generator/energy_sinks.py b/tests/utils/data_generator/energy_sinks.py
index f2440f9..8101441 100644
--- a/tests/utils/data_generator/energy_sinks.py
+++ b/tests/utils/data_generator/energy_sinks.py
@@ -3,15 +3,14 @@
 from ensysmod import crud
 from ensysmod.model import EnergySink
 from ensysmod.schemas import EnergySinkCreate
-from tests.utils.data_generator.datasets import random_existing_dataset, fixed_existing_dataset
-from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity, \
-    fixed_existing_energy_commodity
+from tests.utils.data_generator.datasets import fixed_existing_dataset
+from tests.utils.data_generator.energy_commodities import fixed_existing_energy_commodity
 from tests.utils.utils import random_lower_string
 
 
 def random_energy_sink_create(db: Session) -> EnergySinkCreate:
-    dataset = random_existing_dataset(db)
-    commodity = random_existing_energy_commodity(db)
+    dataset = fixed_existing_dataset(db)
+    commodity = fixed_existing_energy_commodity(db)
     return EnergySinkCreate(
         ref_dataset=dataset.id,
         name=f"EnergySink-{dataset.id}-{random_lower_string()}",
diff --git a/tests/utils/data_generator/energy_sources.py b/tests/utils/data_generator/energy_sources.py
index 84f870e..8c0b760 100644
--- a/tests/utils/data_generator/energy_sources.py
+++ b/tests/utils/data_generator/energy_sources.py
@@ -4,14 +4,12 @@
 from ensysmod.model import EnergySource
 from ensysmod.schemas import EnergySourceCreate
 from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
-from tests.utils.data_generator.datasets import random_existing_dataset
-from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
 from tests.utils.utils import random_lower_string
 
 
 def random_energy_source_create(db: Session) -> EnergySourceCreate:
-    dataset = random_existing_dataset(db)
-    commodity = random_existing_energy_commodity(db)
+    dataset = fixed_existing_dataset(db)
+    commodity = fixed_existing_energy_commodity(db)
     return EnergySourceCreate(
         ref_dataset=dataset.id,
         name=f"EnergySource-{dataset.id}-{random_lower_string()}",
diff --git a/tests/utils/data_generator/energy_storages.py b/tests/utils/data_generator/energy_storages.py
index 42213c9..ad110b9 100644
--- a/tests/utils/data_generator/energy_storages.py
+++ b/tests/utils/data_generator/energy_storages.py
@@ -4,14 +4,12 @@
 from ensysmod.model import EnergyStorage
 from ensysmod.schemas import EnergyStorageCreate
 from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
-from tests.utils.data_generator.datasets import random_existing_dataset
-from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
 from tests.utils.utils import random_lower_string
 
 
 def random_energy_storage_create(db: Session) -> EnergyStorageCreate:
-    dataset = random_existing_dataset(db)
-    commodity = random_existing_energy_commodity(db)
+    dataset = fixed_existing_dataset(db)
+    commodity = fixed_existing_energy_commodity(db)
     return EnergyStorageCreate(
         ref_dataset=dataset.id,
         name=f"EnergyStorage-{dataset.id}-{random_lower_string()}",
diff --git a/tests/utils/data_generator/energy_transmissions.py b/tests/utils/data_generator/energy_transmissions.py
index 37c073c..d5f9a2f 100644
--- a/tests/utils/data_generator/energy_transmissions.py
+++ b/tests/utils/data_generator/energy_transmissions.py
@@ -4,14 +4,12 @@
 from ensysmod.model import EnergyTransmission
 from ensysmod.schemas import EnergyTransmissionCreate
 from tests.utils.data_generator import fixed_existing_dataset, fixed_existing_energy_commodity
-from tests.utils.data_generator.datasets import random_existing_dataset
-from tests.utils.data_generator.energy_commodities import random_existing_energy_commodity
 from tests.utils.utils import random_lower_string
 
 
 def random_energy_transmission_create(db: Session) -> EnergyTransmissionCreate:
-    dataset = random_existing_dataset(db)
-    commodity = random_existing_energy_commodity(db)
+    dataset = fixed_existing_dataset(db)
+    commodity = fixed_existing_energy_commodity(db)
     return EnergyTransmissionCreate(
         ref_dataset=dataset.id,
         name=f"EnergyTransmission-{dataset.id}-{random_lower_string()}",