diff --git a/src/cal_tools/calcat_interface2.py b/src/cal_tools/calcat_interface2.py
index ede5a89ca31222ed63cf10734d709f09885134a8..456f85517473dc05aad59223d9061f0e74642d06 100644
--- a/src/cal_tools/calcat_interface2.py
+++ b/src/cal_tools/calcat_interface2.py
@@ -130,7 +130,7 @@ class CalibrationData(Mapping):
 
             cal_id_map = {
                 api.calibration_id(calibration): calibration
-                for calibration in calibrations
+                for calibration in cal_types
             }
             calibration_ids = list(cal_id_map.keys())
 
@@ -153,7 +153,7 @@ class CalibrationData(Mapping):
 
         res = cls(d)
         if modules:
-            res = res.select_modules(modules)
+            res = res.select_modules(*modules)
         return res
 
     @classmethod
diff --git a/tests/test_calcat_interface2.py b/tests/test_calcat_interface2.py
index dc9be2ec1f172ed81d8f6c48ed034804c45c1e85..9897f0a8f1ee31c382e5a1b7365c5b365002af9e 100644
--- a/tests/test_calcat_interface2.py
+++ b/tests/test_calcat_interface2.py
@@ -20,9 +20,10 @@ def test_AGIPD_CalibrationData_metadata():
     )
     agipd_cd = CalibrationData.from_condition(
         cond,
-        "SPB_DET_AGIPD1M-1",
+        "MID_DET_AGIPD1M-1",
         event_at="2022-09-01 13:26:48.00",
         modules=['AGIPD00'],
+        calibrations=['Offset', 'SlopesFF'],
     )
     assert 'Offset' in agipd_cd
     assert set(agipd_cd['Offset'].constants) == {'AGIPD00'}