diff --git a/glass/_array_api_utils.py b/glass/_array_api_utils.py
index 4e16c53c..1f1683e0 100644
--- a/glass/_array_api_utils.py
+++ b/glass/_array_api_utils.py
@@ -17,13 +17,14 @@
 from __future__ import annotations
 
 import functools
-from typing import TYPE_CHECKING, Any
+import typing
 
 import array_api_compat
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Sequence
     from types import ModuleType
+    from typing import Any
 
     import numpy as np
 
diff --git a/glass/_rng.py b/glass/_rng.py
index 86be5458..65b93e67 100644
--- a/glass/_rng.py
+++ b/glass/_rng.py
@@ -10,9 +10,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import DTypeLike, FloatArray, IntArray, UnifiedGenerator
diff --git a/glass/_types.py b/glass/_types.py
index 910268f1..83af8081 100644
--- a/glass/_types.py
+++ b/glass/_types.py
@@ -1,8 +1,9 @@
-from typing import TYPE_CHECKING, Any
+import typing
+from typing import Any
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Sequence
-    from typing import ParamSpec, TypeAlias, TypeVar
+    from typing import TypeAlias
 
     import jaxtyping
     import numpy as np
@@ -13,9 +14,9 @@
     import glass.jax
     from glass import _rng
 
-    P = ParamSpec("P")
-    R = TypeVar("R")
-    T = TypeVar("T")
+    P = typing.ParamSpec("P")
+    R = typing.TypeVar("R")
+    T = typing.TypeVar("T")
 
     AnyArray: TypeAlias = np.typing.NDArray[Any] | jaxtyping.Array | Array
     ComplexArray: TypeAlias = np.typing.NDArray[np.complex128] | jaxtyping.Array | Array
diff --git a/glass/algorithm.py b/glass/algorithm.py
index cac245d0..a497ddc1 100644
--- a/glass/algorithm.py
+++ b/glass/algorithm.py
@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
+import typing
 import warnings
-from typing import TYPE_CHECKING
 
 import array_api_compat
 import array_api_extra as xpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import FloatArray
 
 
diff --git a/glass/arraytools.py b/glass/arraytools.py
index 49a27221..72fe0162 100644
--- a/glass/arraytools.py
+++ b/glass/arraytools.py
@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 import array_api_extra as xpx
 
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import AnyArray, FloatArray, IntArray
@@ -175,9 +175,12 @@ def trapezoid_product(
     x: FloatArray
     x, _ = f
     for x_, _ in ff:
-        x = xpx.union1d(  # ty: ignore[invalid-assignment]
-            x[(x >= x_[0]) & (x <= x_[-1])],
-            x_[(x_ >= x[0]) & (x_ <= x[-1])],
+        x = typing.cast(
+            "FloatArray",
+            xpx.union1d(
+                x[(x >= x_[0]) & (x <= x_[-1])],
+                x_[(x_ >= x[0]) & (x_ <= x[-1])],
+            ),
         )
     y = uxpx.interp(x, *f)
     for f_ in ff:
diff --git a/glass/cosmology.py b/glass/cosmology.py
index cf2d2aa8..40e0cb1d 100644
--- a/glass/cosmology.py
+++ b/glass/cosmology.py
@@ -1,6 +1,6 @@
 """Module for cosmology.api utilities."""
 
-from typing import Protocol
+import typing
 
 import cosmology.api
 
@@ -18,6 +18,6 @@ class Cosmology(
     cosmology.api.HasOmegaM0[AnyArray],  # ty: ignore[invalid-type-arguments]
     cosmology.api.HasOmegaM[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
     cosmology.api.HasTransverseComovingDistance[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
-    Protocol,
+    typing.Protocol,
 ):
     """Cosmology protocol for GLASS."""
diff --git a/glass/fields.py b/glass/fields.py
index 3a561937..1c017023 100644
--- a/glass/fields.py
+++ b/glass/fields.py
@@ -5,9 +5,9 @@
 import itertools
 import math
 import sys
+import typing
 import warnings
 from collections.abc import Sequence
-from typing import TYPE_CHECKING
 
 import numpy as np
 import transformcl
@@ -23,7 +23,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
     from types import ModuleType
     from typing import Literal
@@ -41,7 +41,7 @@
 if sys.version_info >= (3, 13):
     from warnings import deprecated
 else:
-    if TYPE_CHECKING:
+    if typing.TYPE_CHECKING:
         from glass._types import P, R
 
     def deprecated(msg: str, /) -> Callable[[Callable[P, R]], Callable[P, R]]:
@@ -226,7 +226,7 @@ def cls2cov(
             cov = xpx.at(cov)[:n, i].set(cl)
             cov = xpx.at(cov)[n:, i].set(0.0)
         cov /= 2
-        yield cov  # ty: ignore[invalid-yield]
+        yield typing.cast("FloatArray", cov)
 
 
 def discretized_cls(
@@ -551,7 +551,7 @@ def getcl(
             cl = cl[: lmax + 1]
         else:
             cl = xpx.pad(cl, (0, lmax + 1 - cl.shape[0]))
-    return cl  # ty: ignore[invalid-return-type]
+    return typing.cast("FloatArray", cl)
 
 
 def enumerate_spectra(
@@ -1023,7 +1023,7 @@ def cov_from_spectra(
         cov = xpx.at(cov)[:size, i, j].set(cl_flat[:size])
         cov = xpx.at(cov)[:size, j, i].set(cl_flat[:size])
 
-    return cov  # ty: ignore[invalid-return-type]
+    return typing.cast("AnyArray", cov)
 
 
 def check_posdef_spectra(spectra: AngularPowerSpectra) -> bool:
diff --git a/glass/galaxies.py b/glass/galaxies.py
index 63f85540..494be1b3 100644
--- a/glass/galaxies.py
+++ b/glass/galaxies.py
@@ -20,8 +20,8 @@
 from __future__ import annotations
 
 import math
+import typing
 import warnings
-from typing import TYPE_CHECKING
 
 import array_api_compat
 import array_api_extra as xpx
@@ -32,7 +32,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import FloatArray, UnifiedGenerator
diff --git a/glass/grf/_core.py b/glass/grf/_core.py
index f82262c7..01d0de64 100644
--- a/glass/grf/_core.py
+++ b/glass/grf/_core.py
@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Protocol
+import typing
 
 import transformcl
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import NotImplementedType
 
     from glass._types import AnyArray
 
 
-class Transformation(Protocol):
+class Transformation(typing.Protocol):
     """Protocol for transformations of Gaussian random fields."""
 
     def __call__(self, x: AnyArray, var: float, /) -> AnyArray:
diff --git a/glass/grf/_solver.py b/glass/grf/_solver.py
index 131927b0..93ad3097 100644
--- a/glass/grf/_solver.py
+++ b/glass/grf/_solver.py
@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 from transformcl import cltocorr, corrtocl
 
 import glass.grf
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import AnyArray
 
 
diff --git a/glass/grf/_transformations.py b/glass/grf/_transformations.py
index a4813121..9b356961 100644
--- a/glass/grf/_transformations.py
+++ b/glass/grf/_transformations.py
@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+import typing
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import NotImplementedType
 
     from glass._types import AnyArray
diff --git a/glass/harmonics.py b/glass/harmonics.py
index 651fd761..5befaab5 100644
--- a/glass/harmonics.py
+++ b/glass/harmonics.py
@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import ComplexArray, FloatArray
 
 
diff --git a/glass/healpix.py b/glass/healpix.py
index 0d321837..6298d20e 100644
--- a/glass/healpix.py
+++ b/glass/healpix.py
@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
+import typing
 from collections.abc import Sequence
-from typing import TYPE_CHECKING
 
 import healpix
 import healpy
@@ -14,7 +14,7 @@
 import glass._array_api_utils as _utils
 from glass import _rng
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import ComplexArray, DTypeLike, FloatArray, IntArray
diff --git a/glass/jax.py b/glass/jax.py
index eab52e58..e8df9761 100644
--- a/glass/jax.py
+++ b/glass/jax.py
@@ -4,7 +4,7 @@
 
 import math
 import threading
-from typing import TYPE_CHECKING
+import typing
 
 import jax.dtypes
 import jax.numpy as jnp
@@ -12,7 +12,7 @@
 import jax.scipy
 import jax.typing
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from typing import Self
 
     from jaxtyping import PRNGKeyArray
diff --git a/glass/lensing.py b/glass/lensing.py
index aa21d31f..7723c832 100644
--- a/glass/lensing.py
+++ b/glass/lensing.py
@@ -31,7 +31,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Literal, overload
+import typing
 
 import numpy as np
 
@@ -41,30 +41,31 @@
 import glass.healpix as hp
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Sequence
     from types import ModuleType
+    from typing import Literal
 
     from glass._types import AnyArray, ComplexArray, FloatArray
     from glass.cosmology import Cosmology
     from glass.shells import RadialWindow
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
     *,
-    potential: Literal[False],
-    deflection: Literal[False],
-    shear: Literal[False],
+    potential: Literal[False] = False,
+    deflection: Literal[False] = False,
+    shear: Literal[False] = False,
     discretized: bool = True,
 ) -> tuple[()]:
     # returns empty tuple
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -78,7 +79,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -92,7 +93,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -106,7 +107,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -123,7 +124,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -140,7 +141,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -157,7 +158,7 @@ def from_convergence(
     ...
 
 
-@overload
+@typing.overload
 def from_convergence(
     kappa: FloatArray,
     lmax: int | None = None,
@@ -625,7 +626,7 @@ def multi_plane_matrix(
     for i, w in enumerate(shells):
         mpc.add_window(xp.asarray(wmat[i, :], copy=True), w)
         wmat = xpx.at(wmat)[i, :].set(mpc.kappa)
-    return wmat  # ty: ignore[invalid-return-type]
+    return typing.cast("FloatArray", wmat)
 
 
 def multi_plane_weights(
diff --git a/glass/observations.py b/glass/observations.py
index 37646246..481ecf0a 100644
--- a/glass/observations.py
+++ b/glass/observations.py
@@ -29,7 +29,7 @@
 
 import itertools
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 
@@ -38,7 +38,7 @@
 import glass.healpix as hp
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import FloatArray
diff --git a/glass/points.py b/glass/points.py
index 999a0d04..55c29ee7 100644
--- a/glass/points.py
+++ b/glass/points.py
@@ -40,7 +40,8 @@
 
 import itertools
 import math
-from typing import TYPE_CHECKING, Any
+import typing
+from typing import Any
 
 import array_api_compat
 import array_api_extra as xpx
@@ -51,7 +52,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Generator
     from types import ModuleType
 
diff --git a/glass/shapes.py b/glass/shapes.py
index dec0ad11..bafdac88 100644
--- a/glass/shapes.py
+++ b/glass/shapes.py
@@ -25,7 +25,7 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 import array_api_extra as xpx
@@ -33,7 +33,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import ComplexArray, FloatArray, IntArray, UnifiedGenerator
@@ -282,7 +282,7 @@ def ellipticity_gaussian(
         eps = xpx.at(eps)[i : i + count_broadcasted[k]].set(e)
         i += count_broadcasted[k]
 
-    return eps  # ty: ignore[invalid-return-type]
+    return typing.cast("ComplexArray", eps)
 
 
 def ellipticity_intnorm(
@@ -361,4 +361,4 @@ def ellipticity_intnorm(
         eps = xpx.at(eps)[i : i + count_broadcasted[k]].set(e)
         i += count_broadcasted[k]
 
-    return eps  # ty: ignore[invalid-return-type]
+    return typing.cast("ComplexArray", eps)
diff --git a/glass/shells.py b/glass/shells.py
index 40334d33..02073643 100644
--- a/glass/shells.py
+++ b/glass/shells.py
@@ -48,8 +48,8 @@
 import dataclasses
 import itertools
 import math
+import typing
 import warnings
-from typing import TYPE_CHECKING
 
 import array_api_compat
 import array_api_extra as xpx
@@ -59,7 +59,7 @@
 import glass.arraytools
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Iterator, Sequence
     from types import ModuleType
 
@@ -526,7 +526,7 @@ def restrict(
         left=0.0,
         right=0.0,
     ) * glass.arraytools.ndinterp(zr, w.za, w.wa)
-    return zr, fr  # ty: ignore[invalid-return-type]
+    return typing.cast("FloatArray", zr), typing.cast("FloatArray", fr)
 
 
 def partition(
diff --git a/glass/user.py b/glass/user.py
index 3c5a9627..b0db0551 100644
--- a/glass/user.py
+++ b/glass/user.py
@@ -19,12 +19,12 @@
 
 from __future__ import annotations
 
+import typing
 from contextlib import contextmanager
-from typing import TYPE_CHECKING
 
 import numpy as np
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     import importlib.util
     from collections.abc import Generator
     from os import PathLike
diff --git a/tests/benchmarks/test_arraytools.py b/tests/benchmarks/test_arraytools.py
index 63409f37..344ac9a7 100644
--- a/tests/benchmarks/test_arraytools.py
+++ b/tests/benchmarks/test_arraytools.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass.arraytools
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_benchmark.fixture import BenchmarkFixture
diff --git a/tests/benchmarks/test_fields.py b/tests/benchmarks/test_fields.py
index ef5042c6..e859bebd 100644
--- a/tests/benchmarks/test_fields.py
+++ b/tests/benchmarks/test_fields.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import random
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -11,7 +11,7 @@
 import glass.fields
 import glass.healpix as hp
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
     from typing import Any
 
diff --git a/tests/benchmarks/test_galaxies.py b/tests/benchmarks/test_galaxies.py
index 26058efc..fce2c71d 100644
--- a/tests/benchmarks/test_galaxies.py
+++ b/tests/benchmarks/test_galaxies.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_benchmark.fixture import BenchmarkFixture
diff --git a/tests/benchmarks/test_harmonics.py b/tests/benchmarks/test_harmonics.py
index d0953bd6..258d8415 100644
--- a/tests/benchmarks/test_harmonics.py
+++ b/tests/benchmarks/test_harmonics.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -12,7 +12,7 @@
 )
 
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_benchmark.fixture import BenchmarkFixture
diff --git a/tests/benchmarks/test_lensing.py b/tests/benchmarks/test_lensing.py
index 1684ae4d..a51403f5 100644
--- a/tests/benchmarks/test_lensing.py
+++ b/tests/benchmarks/test_lensing.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
     from typing import Never
 
diff --git a/tests/benchmarks/test_points.py b/tests/benchmarks/test_points.py
index 396b5aa5..6da1f9cc 100644
--- a/tests/benchmarks/test_points.py
+++ b/tests/benchmarks/test_points.py
@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable
     from types import ModuleType
     from typing import Any
diff --git a/tests/benchmarks/test_shapes.py b/tests/benchmarks/test_shapes.py
index e24ddfe6..dff59924 100644
--- a/tests/benchmarks/test_shapes.py
+++ b/tests/benchmarks/test_shapes.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_benchmark.fixture import BenchmarkFixture
diff --git a/tests/benchmarks/test_shells.py b/tests/benchmarks/test_shells.py
index 859a7d4e..fd5958c0 100644
--- a/tests/benchmarks/test_shells.py
+++ b/tests/benchmarks/test_shells.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_benchmark.fixture import BenchmarkFixture
diff --git a/tests/core/grf/test_core.py b/tests/core/grf/test_core.py
index 88d5c214..427974f0 100644
--- a/tests/core/grf/test_core.py
+++ b/tests/core/grf/test_core.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
 import glass.grf
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_mock import MockerFixture
diff --git a/tests/core/grf/test_solver.py b/tests/core/grf/test_solver.py
index d3f3e8ce..b55f9878 100644
--- a/tests/core/grf/test_solver.py
+++ b/tests/core/grf/test_solver.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
@@ -9,7 +9,7 @@
 
 import glass.grf
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import FloatArray
 
 
diff --git a/tests/core/grf/test_transformations.py b/tests/core/grf/test_transformations.py
index a24ad492..87655eb0 100644
--- a/tests/core/grf/test_transformations.py
+++ b/tests/core/grf/test_transformations.py
@@ -1,12 +1,12 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_extra as xpx
 
 import glass.grf
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import UnifiedGenerator
diff --git a/tests/core/test_algorithm.py b/tests/core/test_algorithm.py
index 83c1e433..1de50999 100644
--- a/tests/core/test_algorithm.py
+++ b/tests/core/test_algorithm.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass.algorithm
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_mock import MockerFixture
diff --git a/tests/core/test_arraytools.py b/tests/core/test_arraytools.py
index 841a29b8..25378f3d 100644
--- a/tests/core/test_arraytools.py
+++ b/tests/core/test_arraytools.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass.arraytools
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
 
diff --git a/tests/core/test_fields.py b/tests/core/test_fields.py
index 2c07ebcd..9efe41e2 100644
--- a/tests/core/test_fields.py
+++ b/tests/core/test_fields.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import importlib.util
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
@@ -13,7 +13,7 @@
 import glass.healpix as hp
 from glass import _rng
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_mock import MockerFixture
diff --git a/tests/core/test_galaxies.py b/tests/core/test_galaxies.py
index 9e108864..b3eccd32 100644
--- a/tests/core/test_galaxies.py
+++ b/tests/core/test_galaxies.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from pytest_mock import MockerFixture
diff --git a/tests/core/test_harmonics.py b/tests/core/test_harmonics.py
index e00d2b91..62b9cffc 100644
--- a/tests/core/test_harmonics.py
+++ b/tests/core/test_harmonics.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass.harmonics
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
 
diff --git a/tests/core/test_healpix.py b/tests/core/test_healpix.py
index 116e7f4f..5e2eb6d2 100644
--- a/tests/core/test_healpix.py
+++ b/tests/core/test_healpix.py
@@ -2,7 +2,7 @@
 
 import importlib.util
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import healpix
 import healpy
@@ -14,7 +14,7 @@
 import glass.healpix as hp
 from glass import _rng
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import UnifiedGenerator
diff --git a/tests/core/test_lensing.py b/tests/core/test_lensing.py
index 6ff56dbb..63c1dee0 100644
--- a/tests/core/test_lensing.py
+++ b/tests/core/test_lensing.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -11,7 +11,7 @@
 import glass.healpix as hp
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import FloatArray, UnifiedGenerator
@@ -29,7 +29,7 @@ def test_from_convergence(urng: UnifiedGenerator) -> None:
 
     # check with all False
 
-    results = glass.from_convergence(kappa)  # ty: ignore[no-matching-overload]
+    results = glass.from_convergence(kappa)
     assert results == ()
 
     # check all combinations of potential, deflection, shear being True
diff --git a/tests/core/test_observations.py b/tests/core/test_observations.py
index cac05ccf..18032d29 100644
--- a/tests/core/test_observations.py
+++ b/tests/core/test_observations.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
@@ -11,7 +11,7 @@
 import glass
 import glass.healpix as hp
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import UnifiedGenerator
diff --git a/tests/core/test_points.py b/tests/core/test_points.py
index 5e7fbe5d..a0696a33 100644
--- a/tests/core/test_points.py
+++ b/tests/core/test_points.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -12,7 +12,7 @@
 import glass.points
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable
     from types import ModuleType
     from typing import Any
diff --git a/tests/core/test_shapes.py b/tests/core/test_shapes.py
index 554cba2e..cc179249 100644
--- a/tests/core/test_shapes.py
+++ b/tests/core/test_shapes.py
@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
@@ -8,7 +8,7 @@
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import UnifiedGenerator
diff --git a/tests/core/test_shells.py b/tests/core/test_shells.py
index 29895915..27225a54 100644
--- a/tests/core/test_shells.py
+++ b/tests/core/test_shells.py
@@ -2,7 +2,7 @@
 
 import dataclasses
 import math
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
@@ -12,7 +12,7 @@
 import glass
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass.cosmology import Cosmology
diff --git a/tests/core/test_user.py b/tests/core/test_user.py
index ecf6956a..014a1644 100644
--- a/tests/core/test_user.py
+++ b/tests/core/test_user.py
@@ -2,14 +2,14 @@
 
 import importlib.util
 import pathlib
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import AngularPowerSpectra, FloatArray
 
 # check if available for testing
diff --git a/tests/fixtures/array_backends.py b/tests/fixtures/array_backends.py
index 03c8a834..81edf08b 100644
--- a/tests/fixtures/array_backends.py
+++ b/tests/fixtures/array_backends.py
@@ -10,13 +10,13 @@
 
 import importlib.metadata
 import os
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import packaging.version
 import pytest
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
 # environment variable to specify array backends for testing
diff --git a/tests/fixtures/domain.py b/tests/fixtures/domain.py
index 29485409..e8769e70 100644
--- a/tests/fixtures/domain.py
+++ b/tests/fixtures/domain.py
@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
 
 import glass
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import FloatArray
diff --git a/tests/fixtures/generators.py b/tests/fixtures/generators.py
index f4a59047..faf3fbc2 100644
--- a/tests/fixtures/generators.py
+++ b/tests/fixtures/generators.py
@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 import pytest
 
 from glass import _rng
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import UnifiedGenerator
diff --git a/tests/fixtures/helper_classes.py b/tests/fixtures/helper_classes.py
index bf83bbb3..fce737f1 100644
--- a/tests/fixtures/helper_classes.py
+++ b/tests/fixtures/helper_classes.py
@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import pytest
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Generator
     from types import ModuleType
     from typing import Any