diff --git a/tests/test_calcat_interface2.py b/tests/test_calcat_interface2.py
index 5f42f5d29bb69186d892580f98f6590e0c5db587..fa0acc1c64a7227e6ef3e0f90fd1098143333bfd 100644
--- a/tests/test_calcat_interface2.py
+++ b/tests/test_calcat_interface2.py
@@ -4,10 +4,10 @@ from cal_tools.calcat_interface2 import (
     CalibrationData, AGIPDConditions, SingleConstantVersion,
 )
 
+
 @pytest.mark.requires_gpfs
 def test_AGIPD_CalibrationData_metadata():
-    """Test CalibrationData with AGIPD condition
-    """
+    """Test CalibrationData with AGIPD condition"""
     cond = AGIPDConditions(
         # From: https://in.xfel.eu/calibration/calibration_constants/5754#condition
         sensor_bias_voltage=300,  # V
@@ -40,23 +40,25 @@ def test_AGIPD_CalibrationData_metadata_SPB():
         source_energy=9.2,
         gain_mode=0,
         gain_setting=0,
-
     )
     agipd_cd = CalibrationData.from_condition(
         cond,
         "SPB_DET_AGIPD1M-1",
         event_at="2020-01-07 13:26:48.00",
     )
-    assert 'Offset' in agipd_cd
-    assert set(agipd_cd['Offset'].constants) == {f'AGIPD{i:02}' for i in range(16)}
-    assert isinstance(agipd_cd['Offset'].constants['AGIPD00'], SingleConstantVersion)
+    assert "Offset" in agipd_cd
+    assert set(agipd_cd["Offset"].constants) == {f"AGIPD{i:02}" for i in range(16)}
+    assert agipd_cd["Offset"].module_nums == list(range(16))
+    assert agipd_cd["Offset"].qm_names == [
+        f"Q{(i // 4) + 1}M{(i % 4) + 1}" for i in range(16)
+    ]
+    assert isinstance(agipd_cd["Offset"].constants["AGIPD00"], SingleConstantVersion)
 
 
 @pytest.mark.xfail
 @pytest.mark.requires_gpfs
 def test_AGIPD_CalibrationData_report():
-    """Test CalibrationData with AGIPD condition
-    """
+    """Test CalibrationData with data from report"""
     # Report ID: https://in.xfel.eu/calibration/reports/3757
     agipd_cd = CalibrationData.from_report(3757)
     assert set(agipd_cd) == {'Offset', 'Noise', 'ThresholdsDark', 'BadPixelsDark'}