diff --git a/tests/functional/openlp_core/widgets/test_widgets.py b/tests/functional/openlp_core/widgets/test_widgets.py
deleted file mode 100644
index 431570e53..000000000
--- a/tests/functional/openlp_core/widgets/test_widgets.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##########################################################################
-# OpenLP - Open Source Lyrics Projection                                 #
-# ---------------------------------------------------------------------- #
-# Copyright (c) 2008-2021 OpenLP Developers                              #
-# ---------------------------------------------------------------------- #
-# This program is free software: you can redistribute it and/or modify   #
-# it under the terms of the GNU General Public License as published by   #
-# the Free Software Foundation, either version 3 of the License, or      #
-# (at your option) any later version.                                    #
-#                                                                        #
-# This program is distributed in the hope that it will be useful,        #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-# GNU General Public License for more details.                           #
-#                                                                        #
-# You should have received a copy of the GNU General Public License      #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>. #
-##########################################################################
-"""
-Package to test the screens tab functionality (primarily ScreenSelectionWidget and ScreenButton classes)
-within openlp/core/widgets/widgets.py
-"""
-
-import pytest
-
-from unittest.mock import MagicMock, patch
-
-from PyQt5 import QtWidgets, QtCore, QtTest
-
-from openlp.core.widgets.widgets import ScreenSelectionWidget
-
-
-@pytest.fixture()
-def form(settings):
-    test_form = ScreenSelectionWidget()
-    return test_form
-
-
-def mocked_screens(customGeometry):
-    screen0 = MagicMock()
-    screen0.number = 0
-    screen0.is_display = True
-    screen0.is_primary = False
-    screen0.geometry = QtCore.QRect(-271, -1080, 1920, 1080)
-    screen0.custom_geometry = customGeometry
-    screen0.__str__.return_value = "Screen 1"
-    screen1 = MagicMock()
-    screen1.number = 1
-    screen1.is_display = False
-    screen1.is_primary = True
-    screen1.geometry = QtCore.QRect(0, 0, 1366, 768)
-    screen1.custom_geometry = customGeometry
-    screen1.__str__.return_value = "Screen 2"
-    return [screen0, screen1]
-
-
-@patch('openlp.core.display.screens.ScreenList')
-def test_screen_buttons_show_pixels(mocked_screenList, form):
-    '''
-    Test that the screen buttons show the screen sizes in pixels
-    '''
-    # GIVEN: A mocked extended desktop configuration
-
-    mocked_screenList.return_value = mocked_screens(None)
-    form.screens = mocked_screenList()
-
-    # WHEN: When I go into screen settings for the display screen
-    ScreenSelectionWidget.load(form)
-
-    # THEN: The screen buttons should show the correct size of that screen
-    screen_0_button = form.findChild(QtWidgets.QPushButton, 'screen_0_button')
-    screen_1_button = form.findChild(QtWidgets.QPushButton, 'screen_1_button')
-    assert '1920' in str(screen_0_button.text())
-    assert '1080' in str(screen_0_button.text())
-    assert '1366' in str(screen_1_button.text())
-    assert '768' in str(screen_1_button.text())
-
-
-@patch('openlp.core.display.screens.ScreenList')
-def test_spinboxes_no_previous_custom_geometry(mocked_screenList, form):
-    """
-    Test screen custom geometry can be changed from None
-    """
-    # GIVEN: A mocked extended desktop configuration
-
-    mocked_screenList.return_value = mocked_screens(None)
-    form.screens = mocked_screenList()
-
-    # WHEN: When I go into screen settings for the display screen and set the custom geometry
-    ScreenSelectionWidget.load(form)
-    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
-    QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Up)
-    QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Up)
-    QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Down)
-    QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Down)
-
-    # THEN: The spin boxes should show the correct values
-    assert form.left_spin_box.value() == 1
-    assert form.top_spin_box.value() == 1
-    assert form.width_spin_box.value() == 1919
-    assert form.height_spin_box.value() == 1079
-
-
-@patch('openlp.core.display.screens.ScreenList')
-def test_spinboxes_with_previous_custom_geometry(mocked_screenList, form):
-    """
-    Test screen existing custom geometry can be changed
-    """
-    # GIVEN: A mocked extended desktop configuration
-
-    testGeometry = QtCore.QRect(1, 1, 1919, 1079)
-    mocked_screenList.return_value = mocked_screens(testGeometry)
-    form.screens = mocked_screenList()
-
-    # WHEN: When I go into screen settings for the display screen and update the custom geometry
-    ScreenSelectionWidget.load(form)
-    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
-    QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Up)
-    QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Up)
-    QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Down)
-    QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Down)
-
-    # THEN: The spin boxes should show the updated values
-    assert form.left_spin_box.value() == 2
-    assert form.top_spin_box.value() == 2
-    assert form.width_spin_box.value() == 1918
-    assert form.height_spin_box.value() == 1078
-
-
-@patch('openlp.core.display.screens.ScreenList')
-def test_spinboxes_going_outside_screen_geometry(mocked_screenList, form):
-    """
-    Test screen existing custom geometry can be increased beyond the bounds of the screen
-    """
-    # GIVEN: A mocked extended desktop configuration
-
-    testGeometry = QtCore.QRect(1, 1, 1919, 1079)
-    mocked_screenList.return_value = mocked_screens(testGeometry)
-    form.screens = mocked_screenList()
-
-    # WHEN: When I go into screen settings for the display screen and
-    #       update the custom geometry to be outside the screen coordinates
-    ScreenSelectionWidget.load(form)
-    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
-    for _ in range(2):
-        QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Down)
-        QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Down)
-        QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Up)
-        QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Up)
-
-    # THEN: The spin boxes should show the updated values
-    assert form.left_spin_box.value() == -1
-    assert form.top_spin_box.value() == -1
-    assert form.width_spin_box.value() == 1921
-    assert form.height_spin_box.value() == 1081
diff --git a/tests/interfaces/openlp_core/common/__init__.py b/tests/interfaces/openlp_core/common/__init__.py
deleted file mode 100644
index 2ce7ad377..000000000
--- a/tests/interfaces/openlp_core/common/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##########################################################################
-# OpenLP - Open Source Lyrics Projection                                 #
-# ---------------------------------------------------------------------- #
-# Copyright (c) 2008-2021 OpenLP Developers                              #
-# ---------------------------------------------------------------------- #
-# This program is free software: you can redistribute it and/or modify   #
-# it under the terms of the GNU General Public License as published by   #
-# the Free Software Foundation, either version 3 of the License, or      #
-# (at your option) any later version.                                    #
-#                                                                        #
-# This program is distributed in the hope that it will be useful,        #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-# GNU General Public License for more details.                           #
-#                                                                        #
-# You should have received a copy of the GNU General Public License      #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>. #
-##########################################################################
diff --git a/tests/interfaces/openlp_core/common/test_utils.py b/tests/interfaces/openlp_core/common/test_utils.py
deleted file mode 100644
index 2e51242dd..000000000
--- a/tests/interfaces/openlp_core/common/test_utils.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##########################################################################
-# OpenLP - Open Source Lyrics Projection                                 #
-# ---------------------------------------------------------------------- #
-# Copyright (c) 2008-2021 OpenLP Developers                              #
-# ---------------------------------------------------------------------- #
-# This program is free software: you can redistribute it and/or modify   #
-# it under the terms of the GNU General Public License as published by   #
-# the Free Software Foundation, either version 3 of the License, or      #
-# (at your option) any later version.                                    #
-#                                                                        #
-# This program is distributed in the hope that it will be useful,        #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-# GNU General Public License for more details.                           #
-#                                                                        #
-# You should have received a copy of the GNU General Public License      #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>. #
-##########################################################################
-"""
-Functional tests to test the AppLocation class and related methods.
-"""
-
-from openlp.core.common import is_not_image_file
-from tests.utils.constants import RESOURCE_PATH
-
-
-def test_is_not_image_empty():
-    """
-    Test the method handles an empty string
-    """
-    # Given and empty string
-    file_name = ""
-
-    # WHEN testing for it
-    result = is_not_image_file(file_name)
-
-    # THEN the result is false
-    assert result is True, 'The missing file test should return True'
-
-
-def test_is_not_image_with_image_file():
-    """
-    Test the method handles an image file
-    """
-    # Given and empty string
-    file_path = RESOURCE_PATH / 'church.jpg'
-
-    # WHEN testing for it
-    result = is_not_image_file(file_path)
-
-    # THEN the result is false
-    assert result is False, 'The file is present so the test should return False'
-
-
-def test_is_not_image_with_none_image_file():
-    """
-    Test the method handles a non image file
-    """
-    # Given and empty string
-    file_path = RESOURCE_PATH / 'presentations' / 'test.ppt'
-
-    # WHEN testing for it
-    result = is_not_image_file(file_path)
-
-    # THEN the result is false
-    assert result is True, 'The file is not an image file so the test should return True'
diff --git a/tests/interfaces/openlp_core/ui/test_mainwindow.py b/tests/interfaces/openlp_core/ui/test_mainwindow.py
deleted file mode 100644
index ebd1d5157..000000000
--- a/tests/interfaces/openlp_core/ui/test_mainwindow.py
+++ /dev/null
@@ -1,101 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##########################################################################
-# OpenLP - Open Source Lyrics Projection                                 #
-# ---------------------------------------------------------------------- #
-# Copyright (c) 2008-2021 OpenLP Developers                              #
-# ---------------------------------------------------------------------- #
-# This program is free software: you can redistribute it and/or modify   #
-# it under the terms of the GNU General Public License as published by   #
-# the Free Software Foundation, either version 3 of the License, or      #
-# (at your option) any later version.                                    #
-#                                                                        #
-# This program is distributed in the hope that it will be useful,        #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of         #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          #
-# GNU General Public License for more details.                           #
-#                                                                        #
-# You should have received a copy of the GNU General Public License      #
-# along with this program.  If not, see <https://www.gnu.org/licenses/>. #
-##########################################################################
-"""
-Package to test the openlp.core.ui.mainwindow package.
-"""
-import pytest
-from unittest.mock import MagicMock, patch
-
-from PyQt5 import QtGui
-
-from openlp.core.state import State
-from openlp.core.common.registry import Registry
-from openlp.core.lib.plugin import PluginStatus
-from openlp.core.ui.mainwindow import MainWindow
-
-
-@pytest.fixture()
-def main_window(settings, state):
-    """
-    Create the UI
-    """
-    Registry().set_flag('no_web_server', True)
-    mocked_plugin = MagicMock()
-    mocked_plugin.status = PluginStatus.Active
-    mocked_plugin.icon = QtGui.QIcon()
-    Registry().register('mock_plugin', mocked_plugin)
-    State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
-    # Mock classes and methods used by mainwindow.
-    with patch('openlp.core.ui.mainwindow.SettingsForm'), \
-            patch('openlp.core.ui.mainwindow.OpenLPDockWidget'), \
-            patch('openlp.core.ui.mainwindow.QtWidgets.QToolBox'), \
-            patch('openlp.core.ui.mainwindow.QtWidgets.QMainWindow.addDockWidget'), \
-            patch('openlp.core.ui.mainwindow.ServiceManager'), \
-            patch('openlp.core.ui.mainwindow.ThemeManager'), \
-            patch('openlp.core.ui.mainwindow.ProjectorManager'), \
-            patch('openlp.core.ui.mainwindow.HttpServer'), \
-            patch('openlp.core.ui.mainwindow.WebSocketServer'), \
-            patch('openlp.core.ui.mainwindow.start_zeroconf'), \
-            patch('openlp.core.ui.mainwindow.PluginForm'):
-        return MainWindow()
-
-
-def test_restore_current_media_manager_item(main_window):
-    """
-    Regression test for bug #1152509.
-    """
-    # save current plugin: True; current media plugin: 2
-    main_window.settings.setValue('advanced/save current plugin', True)
-    main_window.settings.setValue('advanced/current media plugin', 2)
-
-    # WHEN: Call the restore method.
-    main_window.restore_current_media_manager_item()
-
-    # THEN: The current widget should have been set.
-    main_window.media_tool_box.setCurrentIndex.assert_called_with(2)
-
-
-def test_projector_manager_dock_locked(main_window):
-    """
-    Projector Manager enable UI options -  bug #1390702
-    """
-    # GIVEN: A mocked projector manager dock item:
-    projector_dock = main_window.projector_manager_dock
-
-    # WHEN: main_window.lock_panel action is triggered
-    main_window.lock_panel.triggered.emit(True)
-
-    # THEN: Projector manager dock should have been called with disable UI features
-    projector_dock.setFeatures.assert_called_with(0)
-
-
-def test_projector_manager_dock_unlocked(main_window):
-    """
-    Projector Manager disable UI options -  bug #1390702
-    """
-    # GIVEN: A mocked projector manager dock item:
-    projector_dock = main_window.projector_manager_dock
-
-    # WHEN: main_window.lock_panel action is triggered
-    main_window.lock_panel.triggered.emit(False)
-
-    # THEN: Projector manager dock should have been called with enable UI features
-    projector_dock.setFeatures.assert_called_with(7)
diff --git a/tests/openlp_core/common/test_utils.py b/tests/openlp_core/common/test_utils.py
index 8aee5851e..f1632b170 100644
--- a/tests/openlp_core/common/test_utils.py
+++ b/tests/openlp_core/common/test_utils.py
@@ -23,9 +23,12 @@ Interface tests to test the themeManager class and related methods.
 """
 from unittest.mock import MagicMock
 
+from openlp.core.common import is_not_image_file
 from openlp.core.common.registry import Registry
 from openlp.core.common.utils import wait_for, is_uuid
 
+from tests.utils.constants import RESOURCE_PATH
+
 
 def test_wait_for(registry):
     """
@@ -57,3 +60,45 @@ def test_uuid_not_valid():
 def test_uuid_valid():
     """Test that an valid string UUID returns True"""
     assert is_uuid('2596ac84-9735-11ea-a665-8fa61362d04a'), 'is_uuid() should return True when given a valid UUID'
+
+
+def test_is_not_image_empty():
+    """
+    Test the method handles an empty string
+    """
+    # Given and empty string
+    file_name = ""
+
+    # WHEN testing for it
+    result = is_not_image_file(file_name)
+
+    # THEN the result is false
+    assert result is True, 'The missing file test should return True'
+
+
+def test_is_not_image_with_image_file():
+    """
+    Test the method handles an image file
+    """
+    # Given and empty string
+    file_path = RESOURCE_PATH / 'church.jpg'
+
+    # WHEN testing for it
+    result = is_not_image_file(file_path)
+
+    # THEN the result is false
+    assert result is False, 'The file is present so the test should return False'
+
+
+def test_is_not_image_with_none_image_file():
+    """
+    Test the method handles a non image file
+    """
+    # Given and empty string
+    file_path = RESOURCE_PATH / 'presentations' / 'test.ppt'
+
+    # WHEN testing for it
+    result = is_not_image_file(file_path)
+
+    # THEN the result is false
+    assert result is True, 'The file is not an image file so the test should return True'
diff --git a/tests/openlp_core/ui/test_mainwindow.py b/tests/openlp_core/ui/test_mainwindow.py
index 9896c7e5e..5d6f834b7 100644
--- a/tests/openlp_core/ui/test_mainwindow.py
+++ b/tests/openlp_core/ui/test_mainwindow.py
@@ -28,11 +28,13 @@ from unittest.mock import MagicMock, patch
 from shutil import rmtree
 from tempfile import mkdtemp
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore, QtWidgets, QtGui
 
 from openlp.core.common.i18n import UiStrings
 from openlp.core.common.registry import Registry
 from openlp.core.display.screens import ScreenList
+from openlp.core.lib.plugin import PluginStatus
+from openlp.core.state import State
 from openlp.core.ui.mainwindow import MainWindow
 from tests.utils.constants import TEST_RESOURCES_PATH, RESOURCE_PATH
 
@@ -75,6 +77,32 @@ def main_window(state, settings, mocked_qapp):
     add_toolbar_action_patcher.stop()
 
 
+@pytest.fixture()
+def main_window_reduced(settings, state):
+    """
+    Create the UI
+    """
+    Registry().set_flag('no_web_server', True)
+    mocked_plugin = MagicMock()
+    mocked_plugin.status = PluginStatus.Active
+    mocked_plugin.icon = QtGui.QIcon()
+    Registry().register('mock_plugin', mocked_plugin)
+    State().add_service("mock", 1, is_plugin=True, status=PluginStatus.Active)
+    # Mock classes and methods used by mainwindow.
+    with patch('openlp.core.ui.mainwindow.SettingsForm'), \
+            patch('openlp.core.ui.mainwindow.OpenLPDockWidget'), \
+            patch('openlp.core.ui.mainwindow.QtWidgets.QToolBox'), \
+            patch('openlp.core.ui.mainwindow.QtWidgets.QMainWindow.addDockWidget'), \
+            patch('openlp.core.ui.mainwindow.ServiceManager'), \
+            patch('openlp.core.ui.mainwindow.ThemeManager'), \
+            patch('openlp.core.ui.mainwindow.ProjectorManager'), \
+            patch('openlp.core.ui.mainwindow.HttpServer'), \
+            patch('openlp.core.ui.mainwindow.WebSocketServer'), \
+            patch('openlp.core.ui.mainwindow.start_zeroconf'), \
+            patch('openlp.core.ui.mainwindow.PluginForm'):
+        return MainWindow()
+
+
 def test_cmd_line_file(main_window):
     """
     Test that passing a service file from the command line loads the service.
@@ -341,3 +369,46 @@ def test_change_data_directory(mocked_get_directory, mocked_get_data_path, mocke
     # Clean up
     rmtree(temp_folder)
     rmtree(temp_new_data_folder)
+
+
+def test_restore_current_media_manager_item(main_window_reduced):
+    """
+    Regression test for bug #1152509.
+    """
+    # save current plugin: True; current media plugin: 2
+    main_window_reduced.settings.setValue('advanced/save current plugin', True)
+    main_window_reduced.settings.setValue('advanced/current media plugin', 2)
+
+    # WHEN: Call the restore method.
+    main_window_reduced.restore_current_media_manager_item()
+
+    # THEN: The current widget should have been set.
+    main_window_reduced.media_tool_box.setCurrentIndex.assert_called_with(2)
+
+
+def test_projector_manager_dock_locked(main_window_reduced):
+    """
+    Projector Manager enable UI options -  bug #1390702
+    """
+    # GIVEN: A mocked projector manager dock item:
+    projector_dock = main_window_reduced.projector_manager_dock
+
+    # WHEN: main_window.lock_panel action is triggered
+    main_window_reduced.lock_panel.triggered.emit(True)
+
+    # THEN: Projector manager dock should have been called with disable UI features
+    projector_dock.setFeatures.assert_called_with(0)
+
+
+def test_projector_manager_dock_unlocked(main_window_reduced):
+    """
+    Projector Manager disable UI options -  bug #1390702
+    """
+    # GIVEN: A mocked projector manager dock item:
+    projector_dock = main_window_reduced.projector_manager_dock
+
+    # WHEN: main_window.lock_panel action is triggered
+    main_window_reduced.lock_panel.triggered.emit(False)
+
+    # THEN: Projector manager dock should have been called with enable UI features
+    projector_dock.setFeatures.assert_called_with(7)
diff --git a/tests/openlp_core/widgets/test_widgets.py b/tests/openlp_core/widgets/test_widgets.py
index 07e45f4a6..6588ce9f1 100644
--- a/tests/openlp_core/widgets/test_widgets.py
+++ b/tests/openlp_core/widgets/test_widgets.py
@@ -21,15 +21,38 @@
 """
 Package to test the openlp.core.widgets.widgets package.
 """
-from unittest import TestCase
+import pytest
 from unittest.mock import MagicMock, call, patch
 
-from PyQt5 import QtCore, QtWidgets
+from PyQt5 import QtCore, QtWidgets, QtTest
 
 from openlp.core.common.settings import ProxyMode
 from openlp.core.display.screens import Screen
 from openlp.core.widgets.widgets import ProxyWidget, ProxyDialog, ScreenButton, ScreenSelectionWidget
-from tests.helpers.testmixin import TestMixin
+
+
+@pytest.fixture()
+def form(settings):
+    test_form = ScreenSelectionWidget()
+    return test_form
+
+
+def mocked_screens(custom_geometry):
+    screen0 = MagicMock()
+    screen0.number = 0
+    screen0.is_display = True
+    screen0.is_primary = False
+    screen0.geometry = QtCore.QRect(-271, -1080, 1920, 1080)
+    screen0.custom_geometry = custom_geometry
+    screen0.__str__.return_value = "Screen 1"
+    screen1 = MagicMock()
+    screen1.number = 1
+    screen1.is_display = False
+    screen1.is_primary = True
+    screen1.geometry = QtCore.QRect(0, 0, 1366, 768)
+    screen1.custom_geometry = custom_geometry
+    screen1.__str__.return_value = "Screen 2"
+    return [screen0, screen1]
 
 
 def test_radio_button_exclusivity_no_proxy(settings):
@@ -204,282 +227,283 @@ def test_screen_button_initialisation():
     assert instance.text() == 'Mocked Screen Object'
 
 
-class TestScreenSelectionWidget(TestCase, TestMixin):
-
-    def setUp(self):
-        """Test setup"""
-        self.setup_application()
-        self.build_settings()
-
-    def tearDown(self):
-        """Tear down tests"""
-        del self.app
-
-    def test_init_default_args(self):
-        """
-        Test the initialisation of ScreenSelectionWidget, when initialised with default arguments
-        """
-        # GIVEN: The ScreenSelectionWidget class
-        # WHEN: Initialising ScreenSelectionWidget with default arguments
-        with patch('openlp.core.widgets.widgets.QtCore.QTimer') as MockTimer:
-            mocked_timer = MagicMock()
-            MockTimer.return_value = mocked_timer
-            instance = ScreenSelectionWidget()
-
-        # THEN: ScreenSelectionWidget should be an instance of QWidget and the screens attribute should be an empty list
-        assert isinstance(instance, QtWidgets.QWidget)
-        assert instance.screens == []
-        mocked_timer.setSingleShot.assert_called_once_with(True)
-        mocked_timer.setInterval.assert_called_once_with(3000)
-
-    def test_init_with_args(self):
-        """
-        Test the initialisation of ScreenSelectionWidget, when initialised with the screens keyword arg set
-        """
-        # GIVEN: The ScreenSelectionWidget class
-        screens_object_mock = MagicMock()
-
-        # WHEN: Initialising ScreenSelectionWidget with the screens keyword arg set
-        with patch('openlp.core.widgets.widgets.QtCore.QTimer') as MockTimer:
-            mocked_timer = MagicMock()
-            MockTimer.return_value = mocked_timer
-            instance = ScreenSelectionWidget(screens=screens_object_mock)
-
-        # THEN: ScreenSelectionWidget should be an instance of QWidget and the screens attribute should the mock used
-        assert isinstance(instance, QtWidgets.QWidget)
-        assert instance.screens is screens_object_mock
-        mocked_timer.setSingleShot.assert_called_once_with(True)
-        mocked_timer.setInterval.assert_called_once_with(3000)
-
-    def test_save_screen_none(self):
-        """
-        Test ScreenSelectionWidget._save_screen when called with the screen arg set as None
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget
+def test_init_default_args():
+    """
+    Test the initialisation of ScreenSelectionWidget, when initialised with default arguments
+    """
+    # GIVEN: The ScreenSelectionWidget class
+    # WHEN: Initialising ScreenSelectionWidget with default arguments
+    with patch('openlp.core.widgets.widgets.QtCore.QTimer') as MockTimer:
+        mocked_timer = MagicMock()
+        MockTimer.return_value = mocked_timer
         instance = ScreenSelectionWidget()
-        instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
 
-        # WHEN: Calling _save_screen and no screen is selected
-        instance._save_screen(None)
+    # THEN: ScreenSelectionWidget should be an instance of QWidget and the screens attribute should be an empty list
+    assert isinstance(instance, QtWidgets.QWidget)
+    assert instance.screens == []
+    mocked_timer.setSingleShot.assert_called_once_with(True)
+    mocked_timer.setInterval.assert_called_once_with(3000)
 
-        # THEN: _save_screen should return without attempting to write to the screen object
-        instance.display_group_box.isChecked.assert_not_called()
 
-    def test_save_screen_not_display(self):
-        """
-        Test ScreenSelectionWidget._save_screen when the display_group_box is not checked.
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget, and a mocked group_box
-        instance = ScreenSelectionWidget()
-        instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
-        instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton, **{'isChecked.return_value': False})
-        mocked_screen_object = MagicMock(spec=Screen)
-        mocked_screen_object.is_dislpay = True
+def test_init_with_args():
+    """
+    Test the initialisation of ScreenSelectionWidget, when initialised with the screens keyword arg set
+    """
+    # GIVEN: The ScreenSelectionWidget class
+    screens_object_mock = MagicMock()
 
-        # WHEN: display_group_box isn't checked and _save_screen is called with a mocked Screen object.
-        instance.display_group_box.isChecked.return_value = False
-        instance._save_screen(mocked_screen_object)
+    # WHEN: Initialising ScreenSelectionWidget with the screens keyword arg set
+    with patch('openlp.core.widgets.widgets.QtCore.QTimer') as MockTimer:
+        mocked_timer = MagicMock()
+        MockTimer.return_value = mocked_timer
+        instance = ScreenSelectionWidget(screens=screens_object_mock)
 
-        # THEN: _save_screen should should be set to False
-        assert mocked_screen_object.is_display is False
+    # THEN: ScreenSelectionWidget should be an instance of QWidget and the screens attribute should the mock used
+    assert isinstance(instance, QtWidgets.QWidget)
+    assert instance.screens is screens_object_mock
+    mocked_timer.setSingleShot.assert_called_once_with(True)
+    mocked_timer.setInterval.assert_called_once_with(3000)
 
-    def test_save_screen_display(self):
-        """
-        Test ScreenSelectionWidget._save_screen when the display_group_box is checked.
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget, and a mocked group_box
-        instance = ScreenSelectionWidget()
-        instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
-        instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton, **{'isChecked.return_value': False})
-        mocked_screen_object = MagicMock(spec=Screen)
 
-        # WHEN: display_group_box is checked and _save_screen is called with a mocked Screen object.
-        instance.display_group_box.isChecked.return_value = True
-        instance._save_screen(mocked_screen_object)
+def test_save_screen_none():
+    """
+    Test ScreenSelectionWidget._save_screen when called with the screen arg set as None
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget
+    instance = ScreenSelectionWidget()
+    instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
 
-        # THEN: _save_screen should should be set to True
-        assert mocked_screen_object.is_display is True
+    # WHEN: Calling _save_screen and no screen is selected
+    instance._save_screen(None)
 
-    @patch('openlp.core.widgets.widgets.QtCore.QRect')
-    def test_save_screen_full_screen(self, mocked_q_rect):
-        """
-        Test ScreenSelectionWidget._save_screen when the display is set to full screen
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget, and a mocked custom_geometry_button
-        instance = ScreenSelectionWidget()
-        instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
-        instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton)
-        mocked_screen_object = MagicMock(spec=Screen)
+    # THEN: _save_screen should return without attempting to write to the screen object
+    instance.display_group_box.isChecked.assert_not_called()
 
-        # WHEN: custom_geometry_button isn't checked and _save_screen is called with a mocked Screen object.
-        instance.custom_geometry_button.isChecked.return_value = False
-        instance._save_screen(mocked_screen_object)
 
-        # THEN: _save_screen should not attempt to save a custom geometry
-        mocked_q_rect.assert_not_called()
+def test_save_screen_not_display():
+    """
+    Test ScreenSelectionWidget._save_screen when the display_group_box is not checked.
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget, and a mocked group_box
+    instance = ScreenSelectionWidget()
+    instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
+    instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton, **{'isChecked.return_value': False})
+    mocked_screen_object = MagicMock(spec=Screen)
+    mocked_screen_object.is_dislpay = True
 
-    @patch('openlp.core.widgets.widgets.QtCore.QRect')
-    def test_save_screen_custom_geometry(self, mocked_q_rect):
-        """
-        Test ScreenSelectionWidget._save_screen when a custom geometry is set
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget, and a mocked custom_geometry_button
-        instance = ScreenSelectionWidget()
-        instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
-        instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton)
-        instance.left_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 100})
-        instance.top_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 200})
-        instance.width_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 300})
-        instance.height_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 400})
-        mocked_screen_object = MagicMock(spec=Screen)
+    # WHEN: display_group_box isn't checked and _save_screen is called with a mocked Screen object.
+    instance.display_group_box.isChecked.return_value = False
+    instance._save_screen(mocked_screen_object)
 
-        # WHEN: custom_geometry_button is checked and _save_screen is called with a mocked Screen object.
-        instance.custom_geometry_button.isChecked.return_value = True
-        instance._save_screen(mocked_screen_object)
+    # THEN: _save_screen should should be set to False
+    assert mocked_screen_object.is_display is False
 
-        # THEN: _save_screen should save the custom geometry
-        mocked_q_rect.assert_called_once_with(100, 200, 300, 400)
 
-    def test_setup_spin_box(self):
-        """
-        Test that ScreenSelectionWidget._setup_spin_box sets up the given spinbox correctly
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget class and a mocked spin box object
-        instance = ScreenSelectionWidget()
-        spin_box_mock = MagicMock(spec=QtWidgets.QSpinBox)
+def test_save_screen_display():
+    """
+    Test ScreenSelectionWidget._save_screen when the display_group_box is checked.
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget, and a mocked group_box
+    instance = ScreenSelectionWidget()
+    instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
+    instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton, **{'isChecked.return_value': False})
+    mocked_screen_object = MagicMock(spec=Screen)
 
-        # WHEN: Calling _setup_spin_box with the mocked spin box object and some sample values
-        instance._setup_spin_box(spin_box_mock, 0, 100, 50)
+    # WHEN: display_group_box is checked and _save_screen is called with a mocked Screen object.
+    instance.display_group_box.isChecked.return_value = True
+    instance._save_screen(mocked_screen_object)
 
-        # THEN: The mocked spin box object should have been set up with the specified values
-        spin_box_mock.setMinimum.assert_called_once_with(0)
-        spin_box_mock.setMaximum.assert_called_once_with(100)
-        spin_box_mock.setValue.assert_called_once_with(50)
+    # THEN: _save_screen should should be set to True
+    assert mocked_screen_object.is_display is True
 
-    def test_load(self):
-        """
-        Test that ScreenSelectionWidget.load() loads the screens correctly
-        """
-        # GIVEN: An instance of the ScreenSelectionWidget and a whole bunch o' mocks
-        instance = ScreenSelectionWidget()
-        mocked_widget = MagicMock()
-        mocked_item = MagicMock()
-        mocked_item.widget.return_value = mocked_widget
-        mocked_screen_frame_layout = MagicMock()
-        mocked_screen_frame_layout.count.side_effect = [1, 0]
-        mocked_screen_frame_layout.takeAt.return_value = mocked_item
-        mocked_screen_button_group = MagicMock()
-        mocked_screen_button_group.buttons.return_value = [mocked_widget]
-        instance.screen_frame_layout = mocked_screen_frame_layout
-        instance.screen_button_group = mocked_screen_button_group
-        instance.screens = [Screen(number=0)]
 
-        # WHEN: load() is called
-        with patch('openlp.core.widgets.widgets.ScreenButton'):
-            instance.load()
+@patch('openlp.core.widgets.widgets.QtCore.QRect')
+def test_save_screen_full_screen(mocked_q_rect):
+    """
+    Test ScreenSelectionWidget._save_screen when the display is set to full screen
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget, and a mocked custom_geometry_button
+    instance = ScreenSelectionWidget()
+    instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
+    instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton)
+    mocked_screen_object = MagicMock(spec=Screen)
 
-        # THEN: The mocks should have been called
-        mocked_widget.setParent.assert_called_once_with(None)
-        mocked_widget.deleteLater.assert_called_once()
-        mocked_screen_button_group.removeButton.assert_called_once_with(mocked_widget)
+    # WHEN: custom_geometry_button isn't checked and _save_screen is called with a mocked Screen object.
+    instance.custom_geometry_button.isChecked.return_value = False
+    instance._save_screen(mocked_screen_object)
 
-    def test_on_identify_timer_shot(self):
-        """
-        Test that the _on_identify_timer_shot() method removes the labels from the screens
-        """
-        # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
-        instance = ScreenSelectionWidget()
+    # THEN: _save_screen should not attempt to save a custom geometry
+    mocked_q_rect.assert_not_called()
+
+
+@patch('openlp.core.widgets.widgets.QtCore.QRect')
+def test_save_screen_custom_geometry(mocked_q_rect):
+    """
+    Test ScreenSelectionWidget._save_screen when a custom geometry is set
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget, and a mocked custom_geometry_button
+    instance = ScreenSelectionWidget()
+    instance.display_group_box = MagicMock(spec=QtWidgets.QGroupBox)
+    instance.custom_geometry_button = MagicMock(spec=QtWidgets.QRadioButton)
+    instance.left_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 100})
+    instance.top_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 200})
+    instance.width_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 300})
+    instance.height_spin_box = MagicMock(spec=QtWidgets.QSpinBox, **{'value.return_value': 400})
+    mocked_screen_object = MagicMock(spec=Screen)
+
+    # WHEN: custom_geometry_button is checked and _save_screen is called with a mocked Screen object.
+    instance.custom_geometry_button.isChecked.return_value = True
+    instance._save_screen(mocked_screen_object)
+
+    # THEN: _save_screen should save the custom geometry
+    mocked_q_rect.assert_called_once_with(100, 200, 300, 400)
+
+
+def test_setup_spin_box():
+    """
+    Test that ScreenSelectionWidget._setup_spin_box sets up the given spinbox correctly
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget class and a mocked spin box object
+    instance = ScreenSelectionWidget()
+    spin_box_mock = MagicMock(spec=QtWidgets.QSpinBox)
+
+    # WHEN: Calling _setup_spin_box with the mocked spin box object and some sample values
+    instance._setup_spin_box(spin_box_mock, 0, 100, 50)
+
+    # THEN: The mocked spin box object should have been set up with the specified values
+    spin_box_mock.setMinimum.assert_called_once_with(0)
+    spin_box_mock.setMaximum.assert_called_once_with(100)
+    spin_box_mock.setValue.assert_called_once_with(50)
+
+
+def test_load():
+    """
+    Test that ScreenSelectionWidget.load() loads the screens correctly
+    """
+    # GIVEN: An instance of the ScreenSelectionWidget and a whole bunch o' mocks
+    instance = ScreenSelectionWidget()
+    mocked_widget = MagicMock()
+    mocked_item = MagicMock()
+    mocked_item.widget.return_value = mocked_widget
+    mocked_screen_frame_layout = MagicMock()
+    mocked_screen_frame_layout.count.side_effect = [1, 0]
+    mocked_screen_frame_layout.takeAt.return_value = mocked_item
+    mocked_screen_button_group = MagicMock()
+    mocked_screen_button_group.buttons.return_value = [mocked_widget]
+    instance.screen_frame_layout = mocked_screen_frame_layout
+    instance.screen_button_group = mocked_screen_button_group
+    instance.screens = [Screen(number=0)]
+
+    # WHEN: load() is called
+    with patch('openlp.core.widgets.widgets.ScreenButton'):
+        instance.load()
+
+    # THEN: The mocks should have been called
+    mocked_widget.setParent.assert_called_once_with(None)
+    mocked_widget.deleteLater.assert_called_once()
+    mocked_screen_button_group.removeButton.assert_called_once_with(mocked_widget)
+
+
+def test_on_identify_timer_shot():
+    """
+    Test that the _on_identify_timer_shot() method removes the labels from the screens
+    """
+    # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
+    instance = ScreenSelectionWidget()
+    mocked_label = MagicMock()
+    instance.identify_labels = [mocked_label]
+
+    # WHEN: _on_identify_timer_shot() is called
+    instance._on_identify_timer_shot()
+
+    # THEN: The labels should be cleared
+    mocked_label.hide.assert_called_once()
+    mocked_label.setParent.assert_called_once_with(None)
+    mocked_label.deleteLater.assert_called_once()
+    assert instance.identify_labels == []
+
+
+def test_on_identify_button_clicked():
+    """
+    Test that the on_identify_button_clicked() method shows a label on each screen
+    """
+    # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
+    instance = ScreenSelectionWidget()
+    mocked_screen = MagicMock()
+    mocked_screen.geometry.x.return_value = 0
+    mocked_screen.geometry.y.return_value = 0
+    mocked_screen.geometry.width.return_value = 1920
+    mocked_screen.__str__.return_value = 'Screen 1'
+    instance.screens = [mocked_screen]
+    instance.timer = MagicMock()
+
+    # WHEN: on_identify_button_clicked() is called
+    with patch('openlp.core.widgets.widgets.QtWidgets.QLabel') as MockLabel:
         mocked_label = MagicMock()
-        instance.identify_labels = [mocked_label]
+        MockLabel.return_value = mocked_label
+        instance.on_identify_button_clicked()
 
-        # WHEN: _on_identify_timer_shot() is called
-        instance._on_identify_timer_shot()
+    # THEN: The labels should be cleared
+    MockLabel.assert_called_once_with(None)
+    mocked_label.setAlignment.assert_called_once_with(QtCore.Qt.AlignCenter)
+    mocked_label.setText.assert_called_once_with('Screen 1')
+    mocked_label.setStyleSheet.assert_called_once_with('font-size: 24pt; font-weight: bold; '
+                                                       'background-color: #0C0; color: #000; '
+                                                       'border: 5px solid #000;')
+    mocked_label.setGeometry.assert_called_once_with(QtCore.QRect(0, 0, 1920, 100))
+    mocked_label.setWindowFlags.assert_called_once_with(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
+                                                        QtCore.Qt.WindowStaysOnTopHint |
+                                                        QtCore.Qt.WindowDoesNotAcceptFocus)
+    mocked_label.show.assert_called_once()
+    assert instance.identify_labels == [mocked_label]
+    instance.timer.start.assert_called_once()
 
-        # THEN: The labels should be cleared
-        mocked_label.hide.assert_called_once()
-        mocked_label.setParent.assert_called_once_with(None)
-        mocked_label.deleteLater.assert_called_once()
-        assert instance.identify_labels == []
 
-    def test_on_identify_button_clicked(self):
-        """
-        Test that the on_identify_button_clicked() method shows a label on each screen
-        """
-        # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
-        instance = ScreenSelectionWidget()
-        mocked_screen = MagicMock()
-        mocked_screen.geometry.x.return_value = 0
-        mocked_screen.geometry.y.return_value = 0
-        mocked_screen.geometry.width.return_value = 1920
-        mocked_screen.__str__.return_value = 'Screen 1'
-        instance.screens = [mocked_screen]
-        instance.timer = MagicMock()
+def test_on_display_clicked_with_checked():
+    """
+    Test that the on_display_clicked() sets the first screen as display when the checkbx is checked
+    """
+    # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
+    instance = ScreenSelectionWidget()
+    mocked_screen_1 = MagicMock()
+    mocked_screen_2 = MagicMock()
+    mocked_screen_2.is_display = True
+    instance.screens = [mocked_screen_1, mocked_screen_2]
+    instance.current_screen = mocked_screen_1
 
-        # WHEN: on_identify_button_clicked() is called
-        with patch('openlp.core.widgets.widgets.QtWidgets.QLabel') as MockLabel:
-            mocked_label = MagicMock()
-            MockLabel.return_value = mocked_label
-            instance.on_identify_button_clicked()
+    # WHEN: on_display_clicked() is called when the checkbox is checked
+    instance.on_display_clicked(True)
 
-        # THEN: The labels should be cleared
-        MockLabel.assert_called_once_with(None)
-        mocked_label.setAlignment.assert_called_once_with(QtCore.Qt.AlignCenter)
-        mocked_label.setText.assert_called_once_with('Screen 1')
-        mocked_label.setStyleSheet.assert_called_once_with('font-size: 24pt; font-weight: bold; '
-                                                           'background-color: #0C0; color: #000; '
-                                                           'border: 5px solid #000;')
-        mocked_label.setGeometry.assert_called_once_with(QtCore.QRect(0, 0, 1920, 100))
-        mocked_label.setWindowFlags.assert_called_once_with(QtCore.Qt.FramelessWindowHint | QtCore.Qt.Tool |
-                                                            QtCore.Qt.WindowStaysOnTopHint |
-                                                            QtCore.Qt.WindowDoesNotAcceptFocus)
-        mocked_label.show.assert_called_once()
-        assert instance.identify_labels == [mocked_label]
-        instance.timer.start.assert_called_once()
+    # THEN: The first screen should be marked as a display
+    assert mocked_screen_1.is_display is True
+    assert mocked_screen_2.is_display is False
 
-    def test_on_display_clicked_with_checked(self):
-        """
-        Test that the on_display_clicked() sets the first screen as display when the checkbx is checked
-        """
-        # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
-        instance = ScreenSelectionWidget()
-        mocked_screen_1 = MagicMock()
-        mocked_screen_2 = MagicMock()
-        mocked_screen_2.is_display = True
-        instance.screens = [mocked_screen_1, mocked_screen_2]
-        instance.current_screen = mocked_screen_1
 
-        # WHEN: on_display_clicked() is called when the checkbox is checked
-        instance.on_display_clicked(True)
+def test_on_display_clicked_with_unchecked():
+    """
+    Test that the on_display_clicked() disallows the checkbox to be unchecked
+    """
+    # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
+    instance = ScreenSelectionWidget()
+    mocked_screen_1 = MagicMock()
+    mocked_screen_2 = MagicMock()
+    mocked_screen_2.is_display = True
+    instance.screens = [mocked_screen_1, mocked_screen_2]
+    instance.current_screen = mocked_screen_2
 
-        # THEN: The first screen should be marked as a display
-        assert mocked_screen_1.is_display is True
-        assert mocked_screen_2.is_display is False
+    # WHEN: on_display_clicked() is called when the checkbox is checked
+    with patch('openlp.core.widgets.widgets.translate') as mocked_translate, \
+            patch('openlp.core.widgets.widgets.critical_error_message_box') as mocked_error:
+        mocked_translate.side_effect = lambda c, s: s
+        instance.on_display_clicked(False)
 
-    def test_on_display_clicked_with_unchecked(self):
-        """
-        Test that the on_display_clicked() disallows the checkbox to be unchecked
-        """
-        # GIVEN: A ScreenSelectionWidget and a bunch o' mocks
-        instance = ScreenSelectionWidget()
-        mocked_screen_1 = MagicMock()
-        mocked_screen_2 = MagicMock()
-        mocked_screen_2.is_display = True
-        instance.screens = [mocked_screen_1, mocked_screen_2]
-        instance.current_screen = mocked_screen_2
-
-        # WHEN: on_display_clicked() is called when the checkbox is checked
-        with patch('openlp.core.widgets.widgets.translate') as mocked_translate, \
-                patch('openlp.core.widgets.widgets.critical_error_message_box') as mocked_error:
-            mocked_translate.side_effect = lambda c, s: s
-            instance.on_display_clicked(False)
-
-        # THEN: The first screen should be marked as a display
-        mocked_error.assert_called_once_with('Select a Display',
-                                             'You need to select at least one screen to be used as a display. '
-                                             'Select the screen you wish to use as a display, and check the '
-                                             'checkbox for that screen.', parent=instance, question=False)
-        assert instance.use_screen_check_box.isChecked() is True
-        assert instance.display_group_box.isChecked() is True
+    # THEN: The first screen should be marked as a display
+    mocked_error.assert_called_once_with('Select a Display',
+                                         'You need to select at least one screen to be used as a display. '
+                                         'Select the screen you wish to use as a display, and check the '
+                                         'checkbox for that screen.', parent=instance, question=False)
+    assert instance.use_screen_check_box.isChecked() is True
+    assert instance.display_group_box.isChecked() is True
 
 
 def test_screen_selection_save(mock_settings):
@@ -499,3 +523,104 @@ def test_screen_selection_save(mock_settings):
     instance._save_screen.assert_called_once_with(mocked_screen)
     mocked_screen.to_dict.assert_called_once()
     mock_settings.setValue.assert_called_once_with('core/screens', {0: {'number': 0}})
+
+
+@patch('openlp.core.display.screens.ScreenList')
+def test_screen_buttons_show_pixels(mocked_screenList, form):
+    '''
+    Test that the screen buttons show the screen sizes in pixels
+    '''
+    # GIVEN: A mocked extended desktop configuration
+
+    mocked_screenList.return_value = mocked_screens(None)
+    form.screens = mocked_screenList()
+
+    # WHEN: When I go into screen settings for the display screen
+    ScreenSelectionWidget.load(form)
+
+    # THEN: The screen buttons should show the correct size of that screen
+    screen_0_button = form.findChild(QtWidgets.QPushButton, 'screen_0_button')
+    screen_1_button = form.findChild(QtWidgets.QPushButton, 'screen_1_button')
+    assert '1920' in str(screen_0_button.text())
+    assert '1080' in str(screen_0_button.text())
+    assert '1366' in str(screen_1_button.text())
+    assert '768' in str(screen_1_button.text())
+
+
+@patch('openlp.core.display.screens.ScreenList')
+def test_spinboxes_no_previous_custom_geometry(mocked_screenList, form):
+    """
+    Test screen custom geometry can be changed from None
+    """
+    # GIVEN: A mocked extended desktop configuration
+
+    mocked_screenList.return_value = mocked_screens(None)
+    form.screens = mocked_screenList()
+
+    # WHEN: When I go into screen settings for the display screen and set the custom geometry
+    ScreenSelectionWidget.load(form)
+    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
+    QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Up)
+    QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Up)
+    QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Down)
+    QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Down)
+
+    # THEN: The spin boxes should show the correct values
+    assert form.left_spin_box.value() == 1
+    assert form.top_spin_box.value() == 1
+    assert form.width_spin_box.value() == 1919
+    assert form.height_spin_box.value() == 1079
+
+
+@patch('openlp.core.display.screens.ScreenList')
+def test_spinboxes_with_previous_custom_geometry(mocked_screenList, form):
+    """
+    Test screen existing custom geometry can be changed
+    """
+    # GIVEN: A mocked extended desktop configuration
+
+    testGeometry = QtCore.QRect(1, 1, 1919, 1079)
+    mocked_screenList.return_value = mocked_screens(testGeometry)
+    form.screens = mocked_screenList()
+
+    # WHEN: When I go into screen settings for the display screen and update the custom geometry
+    ScreenSelectionWidget.load(form)
+    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
+    QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Up)
+    QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Up)
+    QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Down)
+    QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Down)
+
+    # THEN: The spin boxes should show the updated values
+    assert form.left_spin_box.value() == 2
+    assert form.top_spin_box.value() == 2
+    assert form.width_spin_box.value() == 1918
+    assert form.height_spin_box.value() == 1078
+
+
+@patch('openlp.core.display.screens.ScreenList')
+def test_spinboxes_going_outside_screen_geometry(mocked_screenList, form):
+    """
+    Test screen existing custom geometry can be increased beyond the bounds of the screen
+    """
+    # GIVEN: A mocked extended desktop configuration
+
+    testGeometry = QtCore.QRect(1, 1, 1919, 1079)
+    mocked_screenList.return_value = mocked_screens(testGeometry)
+    form.screens = mocked_screenList()
+
+    # WHEN: When I go into screen settings for the display screen and
+    #       update the custom geometry to be outside the screen coordinates
+    ScreenSelectionWidget.load(form)
+    QtTest.QTest.mouseClick(form.custom_geometry_button, QtCore.Qt.LeftButton)
+    for _ in range(2):
+        QtTest.QTest.keyClick(form.left_spin_box, QtCore.Qt.Key_Down)
+        QtTest.QTest.keyClick(form.top_spin_box, QtCore.Qt.Key_Down)
+        QtTest.QTest.keyClick(form.width_spin_box, QtCore.Qt.Key_Up)
+        QtTest.QTest.keyClick(form.height_spin_box, QtCore.Qt.Key_Up)
+
+    # THEN: The spin boxes should show the updated values
+    assert form.left_spin_box.value() == -1
+    assert form.top_spin_box.value() == -1
+    assert form.width_spin_box.value() == 1921
+    assert form.height_spin_box.value() == 1081