diff --git a/pyproject.toml b/pyproject.toml
index 5d0e845..ce32e41 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -123,6 +123,8 @@ ignore = [
   "PLR0911",
   # Missing return type annotation for special method
   "ANN204",
+  # Too many arguments in function definition
+  "PLR0913",
 ]
 
 [tool.ruff.lint.flake8-annotations]
diff --git a/src/labone/instrument.py b/src/labone/instrument.py
index d5ba3d6..20bbc40 100644
--- a/src/labone/instrument.py
+++ b/src/labone/instrument.py
@@ -109,7 +109,7 @@ async def create_from_session(
         )
 
     @staticmethod
-    async def create(  # noqa: PLR0913
+    async def create(
         serial: str,
         *,
         host: str,
diff --git a/src/labone/nodetree/node.py b/src/labone/nodetree/node.py
index 594f98a..62ecf40 100644
--- a/src/labone/nodetree/node.py
+++ b/src/labone/nodetree/node.py
@@ -534,7 +534,7 @@ class ResultNode(MetaNode):
             The time the results where created.
     """
 
-    def __init__(  # noqa: PLR0913
+    def __init__(
         self,
         tree_manager: NodeTreeManager,
         path_segments: tuple[NormalizedPathSegment, ...],
diff --git a/src/labone/server/server.py b/src/labone/server/server.py
index a7bfcda..1814469 100644
--- a/src/labone/server/server.py
+++ b/src/labone/server/server.py
@@ -9,10 +9,13 @@
 from __future__ import annotations
 
 import typing as t
+from asyncio import CancelledError, Future, get_running_loop
+from signal import SIGINT, SIGTERM
 
 import zhinst.comms
 from typing_extensions import TypeAlias
 
+from labone.core.errors import LabOneCoreError
 from labone.core.helper import get_default_context
 
 CapnpResult: TypeAlias = dict[str, t.Any]
@@ -43,6 +46,8 @@ class CapnpServer:
     def __init__(self, schema: zhinst.comms.SchemaLoader):
         self._schema = schema
         self._registered_callbacks: dict[tuple[int, int], t.Callable] = {}
+        self._run_forever_future: Future[None] | None = None
+        self._capnp_server: zhinst.comms.DynamicServer | None = None
         self._load_callbacks()
 
     def _load_callbacks(self) -> None:
@@ -96,6 +101,9 @@ async def start(
             port: port to listen on.
             open_overwrite: Flag if the server should be reachable from outside.
         """
+        if self._capnp_server:
+            msg = f"server {self!r} is already running"
+            raise LabOneCoreError(msg)
         self._capnp_server = await context.listen(
             port=port,
             openOverride=open_overwrite,
@@ -103,6 +111,45 @@ async def start(
             schema=self._schema,
         )
 
+    def close(self) -> None:
+        """Close the server."""
+        if self._capnp_server is None:
+            msg = f"server {self!r} is not running"
+            raise LabOneCoreError(msg)
+        self._capnp_server.close()
+
+    async def run_forever(self) -> None:
+        """Run the server forever.
+
+        Useful for running the server in the main thread.
+
+        This method is a coroutine that will block until the server until a
+        CancelledError is raised. After a CancelledError the server is shutdown
+        properly and the functions returns.
+        """
+        if self._run_forever_future is not None:
+            msg = f"server {self!r} is already being awaited on run_forever()"
+            raise LabOneCoreError(msg)
+        if self._capnp_server is None:
+            msg = f"server {self!r} is not running"
+            raise LabOneCoreError(msg)
+
+        self._run_forever_future = get_running_loop().create_future()
+
+        loop = get_running_loop()
+        for signal_enum in [SIGINT, SIGTERM]:
+            loop.add_signal_handler(signal_enum, self.close)
+
+        try:
+            await self._run_forever_future
+        except CancelledError:
+            try:
+                self.close()
+            finally:
+                raise
+        finally:
+            self._run_forever_future = None
+
     async def start_pipe(
         self,
         context: zhinst.comms.CapnpContext | None = None,
diff --git a/tests/core/test_shf_vector_data.py b/tests/core/test_shf_vector_data.py
index 39760a2..a3f47ba 100644
--- a/tests/core/test_shf_vector_data.py
+++ b/tests/core/test_shf_vector_data.py
@@ -172,7 +172,7 @@ def test_shf_scope_vector(
     ],
 )
 @pytest.mark.parametrize(("x", "y"), [(0, 0), (1, 1), (32, 743)])
-def test_shf_demodulator_vector(  # noqa: PLR0913
+def test_shf_demodulator_vector(
     vector_length,
     scaling,
     timestamp_delta,
diff --git a/tests/mock/ab_hpk_automatic_functionality_test.py b/tests/mock/ab_hpk_automatic_functionality_test.py
index 7dc0fe4..60e6c0b 100644
--- a/tests/mock/ab_hpk_automatic_functionality_test.py
+++ b/tests/mock/ab_hpk_automatic_functionality_test.py
@@ -73,7 +73,7 @@ async def new_test_function(*args, **kwargs):
             exception_mock = e
         assert (exception is None) == (exception_mock is None)
         if exception is not None:
-            assert type(exception) == type(exception_mock)
+            assert type(exception) is type(exception_mock)
         assert string_output.getvalue() == string_output_mock.getvalue()
 
     return new_test_function