diff --git a/tests/test_geo_file.py b/tests/test_geo_file.py
index 6d962e5..0ff42b9 100644
--- a/tests/test_geo_file.py
+++ b/tests/test_geo_file.py
@@ -28,7 +28,7 @@ def csv() -> Path:
     csv = Path(tempfile.NamedTemporaryFile().name)
     url = find_download_url(DB_IP)
     if url is None:
-        raise ValueError()
+        raise TypeError
     tmp = serialize(url)
     unzip(tmp, csv)
     strip_ipv6(csv)
diff --git a/tests/test_html_escaping.py b/tests/test_html_escaping.py
index ed9e42a..ce30eca 100644
--- a/tests/test_html_escaping.py
+++ b/tests/test_html_escaping.py
@@ -1,11 +1,9 @@
 import gi
 import pytest
-from typing import Any
 
 from dzgui.api.servers import Details
 from dzgui.controllers.mc import Controller
 from dzgui.controllers.emitter import Emitter
-from dzgui.views.base import OuterWindow
 from dzgui.views.dialogs.servers import ServerDetailsDialog
 
 
diff --git a/tests/test_loginusers.py b/tests/test_loginusers.py
index cfcba50..08e11dd 100644
--- a/tests/test_loginusers.py
+++ b/tests/test_loginusers.py
@@ -30,7 +30,7 @@ def test_loginusers(monkeypatch: "MonkeyPatch", fixture: str, expect: int) -> No
     monkeypatch.setattr("dzgui.api.steam.find_loginusers", mock_loginusers)
     uid = find_user_id(Path(""))
     if uid is None:
-        raise ValueError()
+        raise TypeError
     assert int(uid) == expect
 
 
diff --git a/tests/test_mod_signatures.py b/tests/test_mod_signatures.py
index 8de0fc7..db3bb6b 100644
--- a/tests/test_mod_signatures.py
+++ b/tests/test_mod_signatures.py
@@ -44,8 +44,9 @@ def test_signatures(monkeypatch: "MonkeyPatch", tmp: str, versions: str) -> None
     monkeypatch.setattr("dzgui.api.mods.lookup", mock_lookup)
     dzgui.api.mods.remove_stale_signatures(path, path, ids)
     with open(tmp, "r") as f:
-        lines = f.readlines()
-    assert ids not in lines
+        lines = [line.rstrip() for line in f.readlines()]
+    concat = ",".join(map(str, ids))
+    assert concat not in lines
 
 
 def test_signatures_with_no_ids(
diff --git a/tests/test_modmeta.py b/tests/test_modmeta.py
index f1ffa01..f5415f7 100644
--- a/tests/test_modmeta.py
+++ b/tests/test_modmeta.py
@@ -12,5 +12,5 @@ def test_modmeta(i: int) -> None:
     path = Path(fixture)
     meta = tokenize(path)
     if meta is None:
-        raise ValueError
+        raise TypeError
     assert meta["name"] == "ModName"
diff --git a/tests/test_remote_api.py b/tests/test_remote_api.py
index 5e90498..0b24577 100644
--- a/tests/test_remote_api.py
+++ b/tests/test_remote_api.py
@@ -1,14 +1,11 @@
 import pytest
 
-from typing import Any, TYPE_CHECKING
+from typing import Any
 
 from dzgui.api import probe
 from dzgui.config.query import get_config
 from dzgui.config.xdg import get_xdg_paths, parse_filepaths
 
-if TYPE_CHECKING:
-    from pathlib import Path
-
 pytestmark = pytest.mark.webtest
 
 
diff --git a/tests/test_row_marshalling.py b/tests/test_row_marshalling.py
index 7e59080..d586d72 100644
--- a/tests/test_row_marshalling.py
+++ b/tests/test_row_marshalling.py
@@ -18,9 +18,10 @@ def test_row_conversion() -> None:
         "Unofficial",
         False,
     ]
-    rows = [ServerRow(*data)]
+    rows = [ServerRow(*data)]  # type: ignore
     marshalled = ServerRow.marshal_rows(rows)
     store = ModelFactory().make_server_store()
     store.extend(marshalled)
-    converted = [[el for el in row] for row in store]
+    cols = store.get_n_columns()
+    converted = [[row[i] for i in range(cols)] for row in store]
     assert data == converted[0]
diff --git a/tests/test_server_metadata.py b/tests/test_server_metadata.py
index 392af2a..1923566 100644
--- a/tests/test_server_metadata.py
+++ b/tests/test_server_metadata.py
@@ -7,7 +7,7 @@ pytestmark = pytest.mark.slow
 
 
 @pytest.fixture
-def details() -> Details:
+def details() -> Details | None:
     """
     Static official server, metadata is expected to be invariate
     """
@@ -21,19 +21,21 @@ def test_invalid_server() -> None:
 
 
 @pytest.mark.parametrize("key, expect", [("day_accel", 2.3), ("night_accel", 6.8)])
-def test_time_accel(details, key, expect) -> None:
+def test_time_accel(details: Details | None, key: str, expect: float) -> None:
     assert getattr(details, key) == expect
 
 
 def test_gametime(details: Details | None) -> None:
     time_reg = r"^(0[0-9]|1[0-9]|2[0-3]):([0-5][0-9]$)"
     if details is None:
-        raise ValueError
+        raise TypeError
     match = re.match(time_reg, details.gametime)
     assert match is not None
 
 
-def test_metadata(details) -> None:
+def test_metadata(details: Details | None) -> None:
+    if details is None:
+        raise TypeError
     for row in details.data:
         label, value = row
         match label:
diff --git a/tests/test_server_time.py b/tests/test_server_time.py
index 8bd32b4..d8af268 100644
--- a/tests/test_server_time.py
+++ b/tests/test_server_time.py
@@ -2,9 +2,10 @@ import pytest
 
 from datetime import datetime, timedelta
 from hypothesis import given, strategies as st
-from typing import Any
+from typing import Any, Callable
 
 from dzgui.views.dialogs.calc import (
+    Emitter,
     LocalClock,
     ServerClock,
     Time,
@@ -14,25 +15,17 @@ from dzgui.views.dialogs.calc import (
 )
 
 
-class DummyEmitter:
-    def __init__(self) -> None:
-        pass
-
-    def connect(self, _: Any, __: Any) -> None:
-        pass
-
-
 @pytest.fixture(params=[("05:00", 10.0), ("15:30", 5.0)])
-def accel_server_clock(request) -> tuple[str, ServerClock]:
+def accel_server_clock(request: pytest.FixtureRequest) -> tuple[str, ServerClock]:
     clock_time, expect = request.param
     cur_time = Time(clock_time, 5.0, 2.0)
-    emitter = DummyEmitter()
+    emitter = Emitter()
     local_clock = LocalClock(emitter)
     server_clock = ServerClock(cur_time, emitter, local_clock)
     return expect, server_clock
 
 
-def test_accel_factor(accel_server_clock: tuple[str, ServerClock]) -> None:
+def test_accel_factor(accel_server_clock: tuple[float, ServerClock]) -> None:
     """Static test checking times at known boundaries"""
     expect, clock = accel_server_clock
     assert clock.get_accel_factor(clock.cur_time) == expect
@@ -106,7 +99,7 @@ def test_time_aggregation(
 
     strtime = start.strftime("%H:%M")
     t = Time(strtime, day_factor, night_factor)
-    emitter = DummyEmitter()
+    emitter = Emitter()
     local_clock = LocalClock(emitter)
     server_clock = ServerClock(t, emitter, local_clock)
     h = end.time().hour
diff --git a/tests/test_time.py b/tests/test_time.py
index c9096b6..d5de922 100644
--- a/tests/test_time.py
+++ b/tests/test_time.py
@@ -2,7 +2,8 @@ import re
 
 from dzgui.model.proxy_model import DAY_REG, NIGHT_REG
 
-def iterate(h: str, r: str) -> None:
+
+def iterate(h: int, r: str) -> None:
     for m in range(60):
         time = f"{h:02}:{m:02}"
         assert re.match(r, time) is not None