diff --git a/tests/test_ds.py b/tests/test_ds.py
index 629a772..7a0268b 100644
--- a/tests/test_ds.py
+++ b/tests/test_ds.py
@@ -8,7 +8,7 @@ import unittest
 # App imports
 from app import playlistmodel
 from app import ds
-from app.models import db
+from dbmanager import db
 from classes import PlaylistDTO
 from helpers import get_all_track_metadata
 from playlistmodel import PlaylistModel
diff --git a/tests/test_file_importer.py b/tests/test_file_importer.py
index caf5396..04bff6f 100644
--- a/tests/test_file_importer.py
+++ b/tests/test_file_importer.py
@@ -21,7 +21,7 @@ from pytestqt.plugin import QtBot  # type: ignore
 
 # App imports
 from app import ds, musicmuster
-from app.models import db
+from dbmanager import db
 from config import Config
 from file_importer import FileImporter
 
diff --git a/tests/test_misc.py b/tests/test_misc.py
index 4e8d8aa..35c386c 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -7,7 +7,7 @@ import unittest
 import pytest
 
 # App imports
-from app.models import db
+from dbmanager import db
 import ds
 
 
@@ -26,7 +26,6 @@ class TestMMMisc(unittest.TestCase):
 
     def test_create_settings(self):
         SETTING_NAME = "wombat"
-        NO_SUCH_SETTING = "abc"
         VALUE = 3
 
         test_non_existant = ds.setting_get(SETTING_NAME)
diff --git a/tests/test_playlistmodel.py b/tests/test_playlistmodel.py
index 1d39d5d..2cba388 100644
--- a/tests/test_playlistmodel.py
+++ b/tests/test_playlistmodel.py
@@ -9,7 +9,7 @@ from PyQt6.QtCore import Qt, QModelIndex
 # App imports
 from app.helpers import get_all_track_metadata
 from app import ds, playlistmodel
-from app.models import db
+from dbmanager import db
 from classes import (
     InsertTrack,
     TrackAndPlaylist,
diff --git a/tests/test_queries.py b/tests/test_queries.py
index 340097e..4601323 100644
--- a/tests/test_queries.py
+++ b/tests/test_queries.py
@@ -8,10 +8,7 @@ import unittest
 # Third party imports
 
 # App imports
-from app.models import (
-    db,
-    Tracks,
-)
+from dbmanager import db
 from classes import (
     Filter,
 )
diff --git a/tests/test_ui.py b/tests/test_ui.py
index c26abce..82c68e1 100644
--- a/tests/test_ui.py
+++ b/tests/test_ui.py
@@ -10,12 +10,9 @@ from pytestqt.plugin import QtBot  # type: ignore
 
 # App imports
 from app import playlistmodel, utilities
-from app.models import (
-    db,
-    Playlists,
-    Tracks,
-)
+from dbmanager import db
 from app import ds, musicmuster
+from classes import InsertTrack
 
 
 # Custom fixture to adapt qtbot for use with unittest.TestCase
@@ -99,7 +96,13 @@ class MyTestCase(unittest.TestCase):
         model = playlistmodel.PlaylistModel(playlist.playlist_id, is_template=False)
 
         # Add a track with a note
-        model.insert_row_signal_handler(track_id=self.track1.track_id, note=note_text)
+        model.insert_row_signal_handler(
+            InsertTrack(
+                playlist_id=playlist.playlist_id,
+                track_id=self.track1.track_id,
+                note=note_text
+            )
+        )
 
         # Retrieve playlist
         all_playlists = ds.playlists_all()