diff --git a/setup.py b/setup.py
index e73c52388c666bcf62a753bf39d580c60c70b61e..4b9926306329e6c798bdc73a0256bf9fccb19b19 100644
--- a/setup.py
+++ b/setup.py
@@ -94,7 +94,7 @@ install_requires = [
 
 if "readthedocs.org" not in sys.executable:
     install_requires += [
-        "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@2.1.0",  # noqa
+        "iCalibrationDB @ git+ssh://git@git.xfel.eu:10022/detectors/cal_db_interactive.git@feat/ccv_tag",  # noqa
         "XFELDetectorAnalysis @ git+ssh://git@git.xfel.eu:10022/karaboDevices/pyDetLib.git@2.7.0",  # noqa
     ]
 
diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py
index cb27f73a68f1d0ef3f0c9493f4eb4ba1ba86f434..a587a3cdde3b843848a0f9ec6a70a20c93f79472 100644
--- a/src/cal_tools/agipdlib.py
+++ b/src/cal_tools/agipdlib.py
@@ -104,7 +104,7 @@ class AgipdCtrl:
 
     def get_gain_setting(
         self,
-        creation_time: "datetime.datetime",
+        creation_time: datetime,
     ) -> Optional[int]:
         """Retrieve Gain setting.
 
@@ -1280,7 +1280,7 @@ class AgipdCorrections:
 
     def initialize_from_db(self, karabo_id: str, karabo_da: str,
                            cal_db_interface: str,
-                           creation_time: datetime.datetime,
+                           creation_time: datetime,
                            memory_cells: float, bias_voltage: int,
                            photon_energy: float, gain_setting: float,
                            acquisition_rate: float, integration_time: int,
diff --git a/tests/test_cal_tools.py b/tests/test_cal_tools.py
index 102f613b7b9f3b9bdb032f5ebe5ab218a8d1e098..cc82e4b17e70be49ab0e3644522d4bd86e2e93aa 100644
--- a/tests/test_cal_tools.py
+++ b/tests/test_cal_tools.py
@@ -335,7 +335,6 @@ def test_get_pdu_from_db(_agipd_const_cond):
                         "CAL_PHYSICAL_DETECTOR_UNIT-2_TEST"]
 
 
-# TODO add a marker for accessing zmq end_point
 @pytest.mark.requires_gpfs
 @pytest.mark.requires_caldb
 def test_initialize_from_db():