diff --git a/tests/tests_bec_ipython_client/test_x_ray_eye_align.py b/tests/tests_bec_ipython_client/test_x_ray_eye_align.py
index 9a07aa3..6338a0c 100644
--- a/tests/tests_bec_ipython_client/test_x_ray_eye_align.py
+++ b/tests/tests_bec_ipython_client/test_x_ray_eye_align.py
@@ -4,6 +4,7 @@ from bec_lib.device import DeviceBase
 
 from csaxs_bec.bec_ipython_client.plugins.LamNI import LamNI
 from csaxs_bec.bec_ipython_client.plugins.LamNI.x_ray_eye_align import XrayEyeAlign
+
 # pylint: disable=unused-import
 
 
@@ -27,6 +28,7 @@ class RTMock(DeviceBase):
 
 
 def test_save_frame(bec_client_mock):
+    # TODO - This test can be remove!
     client = bec_client_mock
     client.device_manager.devices.xeye = DeviceBase(
         name="xeye",
@@ -42,6 +44,7 @@ def test_save_frame(bec_client_mock):
 
 
 def test_update_frame(bec_client_mock):
+    # TODO - This test needs to be revisited, does no longer use the EPICS epics_put/get but device manager methods.
     epics_put = "csaxs_bec.bec_ipython_client.plugins.LamNI.alignment.epics_put"
     epics_get = "csaxs_bec.bec_ipython_client.plugins.LamNI.alignment.epics_get"
     fshopen = "csaxs_bec.bec_ipython_client.plugins.LamNI.alignment.fshopen"
@@ -69,6 +72,7 @@ def test_update_frame(bec_client_mock):
 
 
 def test_disable_rt_feedback(bec_client_mock):
+    # TODO - This test makes sense, check if it works correctly
     client = bec_client_mock
     client.device_manager.devices.xeye = DeviceBase(
         name="xeye",
@@ -88,6 +92,7 @@ def test_disable_rt_feedback(bec_client_mock):
 
 
 def test_enable_rt_feedback(bec_client_mock):
+    # TODO - This test makes sense, check if it works correctly
     client = bec_client_mock
     client.device_manager.devices.xeye = DeviceBase(
         name="xeye",
@@ -107,6 +112,7 @@ def test_enable_rt_feedback(bec_client_mock):
 
 
 def test_tomo_rotate(bec_client_mock):
+    # TODO - This test makes sense, check if it works correctly
     import builtins
 
     client = bec_client_mock