diff --git a/tests/functional/openlp_core_api/test_tab.py b/tests/functional/openlp_core_api/test_tab.py
index e87adba07..2475257f9 100644
--- a/tests/functional/openlp_core_api/test_tab.py
+++ b/tests/functional/openlp_core_api/test_tab.py
@@ -25,13 +25,13 @@ This module contains tests for the lib submodule of the Remotes plugin.
 import os
 import re
 from unittest import TestCase
+from unittest.mock import MagicMock, patch
 
 from PyQt5 import QtWidgets
 
 
 from openlp.core.common import Settings
 from openlp.core.api.tab import ApiTab
-from tests.functional import patch
 from tests.helpers.testmixin import TestMixin
 
 __default_settings__ = {
diff --git a/tests/functional/openlp_core_api/test_websockets.py b/tests/functional/openlp_core_api/test_websockets.py
index 2fe0b91dd..8f1356566 100644
--- a/tests/functional/openlp_core_api/test_websockets.py
+++ b/tests/functional/openlp_core_api/test_websockets.py
@@ -38,7 +38,8 @@ __default_settings__ = {
     'api/password': 'password',
     'api/authentication enabled': False,
     'api/ip address': '0.0.0.0',
-    'api/thumbnails': True
+    'api/thumbnails': True,
+    'songs/chord notation': True
 }
 
 
diff --git a/tests/functional/openlp_plugins/remotes/test_deploy.py b/tests/functional/openlp_plugins/remotes/test_deploy.py
index ec3feafb3..1909b94fd 100644
--- a/tests/functional/openlp_plugins/remotes/test_deploy.py
+++ b/tests/functional/openlp_plugins/remotes/test_deploy.py
@@ -23,12 +23,10 @@
 import os
 import shutil
 
-from unittest.mock import patch
-
 from tempfile import mkdtemp
 from unittest import TestCase
 
-from openlp.plugins.remotes.deploy import check_for_previous_deployment, deploy_zipfile
+from openlp.plugins.remotes.deploy import deploy_zipfile
 
 
 TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', '..', 'resources'))