diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py
new file mode 100644
index 000000000..e0da50eb3
--- /dev/null
+++ b/tests/functional/__init__.py
@@ -0,0 +1,8 @@
+import sip
+sip.setapi(u'QDate', 2)
+sip.setapi(u'QDateTime', 2)
+sip.setapi(u'QString', 2)
+sip.setapi(u'QTextStream', 2)
+sip.setapi(u'QTime', 2)
+sip.setapi(u'QUrl', 2)
+sip.setapi(u'QVariant', 2)
\ No newline at end of file
diff --git a/tests/functional/openlp_core_lib/test_image_manager.py b/tests/functional/openlp_core_lib/test_image_manager.py
new file mode 100644
index 000000000..d13c82c04
--- /dev/null
+++ b/tests/functional/openlp_core_lib/test_image_manager.py
@@ -0,0 +1,50 @@
+"""
+    Package to test the openlp.core.ui package.
+"""
+
+import os
+from unittest import TestCase
+
+from PyQt4 import QtGui
+
+from openlp.core.lib import Registry, ImageManager, ScreenList
+
+
+TEST_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources'))
+
+
+class TestImageManager(TestCase):
+
+    def setUp(self):
+        """
+        Create the UI
+        """
+        Registry.create()
+        self.app = QtGui.QApplication([])
+        ScreenList.create(self.app.desktop())
+        self.image_manager = ImageManager()
+
+    def tearDown(self):
+        """
+        Delete all the C++ objects at the end so that we don't have a segfault
+        """
+        del self.app
+
+    def basic_image_manager_test(self):
+        """
+        Test the Image Manager setup basic functionality
+        """
+        # GIVEN: the an image add to the image manager
+        self.image_manager.add_image(TEST_PATH, u'church.jpg', None)
+
+        # WHEN the image is retrieved
+        image = self.image_manager.get_image(TEST_PATH, u'church.jpg')
+
+        # THEN returned record is a type of image
+        self.assertEqual(isinstance(image, QtGui.QImage), True, u'The returned object should be a QImage')
+
+        # WHEN the image is retrieved has not been loaded
+        # THEN a KeyError is thrown
+        with self.assertRaises(KeyError) as context:
+            self.image_manager.get_image(TEST_PATH, u'church1.jpg')
+        self.assertNotEquals(context.exception[0], u'', u'KeyError exception should have been thrown for missing image')
diff --git a/tests/functional/openlp_core_lib/test_registry.py b/tests/functional/openlp_core_lib/test_registry.py
index a2fe60627..7bb7c84cf 100644
--- a/tests/functional/openlp_core_lib/test_registry.py
+++ b/tests/functional/openlp_core_lib/test_registry.py
@@ -2,13 +2,14 @@
     Package to test the openlp.core.lib package.
 """
 import os
-
 from unittest import TestCase
 from mock import MagicMock
+
 from openlp.core.lib import Registry
 
 TESTPATH = os.path.abspath(os.path.join(os.path.dirname(__file__), u'..', u'..', u'resources'))
 
+
 class TestRegistry(TestCase):
 
     def registry_service_test(self):
diff --git a/tests/functional/openlp_core_lib/test_serviceitem.py b/tests/functional/openlp_core_lib/test_serviceitem.py
index a50752cce..05952471d 100644
--- a/tests/functional/openlp_core_lib/test_serviceitem.py
+++ b/tests/functional/openlp_core_lib/test_serviceitem.py
@@ -3,10 +3,9 @@
 """
 import os
 import cPickle
-
 from unittest import TestCase
-
 from mock import MagicMock
+
 from openlp.core.lib import ServiceItem, Registry
 
 
diff --git a/tests/interfaces/__init__.py b/tests/interfaces/__init__.py
new file mode 100644
index 000000000..e0da50eb3
--- /dev/null
+++ b/tests/interfaces/__init__.py
@@ -0,0 +1,8 @@
+import sip
+sip.setapi(u'QDate', 2)
+sip.setapi(u'QDateTime', 2)
+sip.setapi(u'QString', 2)
+sip.setapi(u'QTextStream', 2)
+sip.setapi(u'QTime', 2)
+sip.setapi(u'QUrl', 2)
+sip.setapi(u'QVariant', 2)
\ No newline at end of file
diff --git a/tests/interfaces/openlp_core_ui/__init__.py b/tests/interfaces/openlp_core_ui/__init__.py
index e69de29bb..8b1378917 100644
--- a/tests/interfaces/openlp_core_ui/__init__.py
+++ b/tests/interfaces/openlp_core_ui/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/interfaces/openlp_core_ui/test_servicemanager.py b/tests/interfaces/openlp_core_ui/test_servicemanager.py
new file mode 100644
index 000000000..bb62bd6e6
--- /dev/null
+++ b/tests/interfaces/openlp_core_ui/test_servicemanager.py
@@ -0,0 +1,43 @@
+"""
+    Package to test the openlp.core.lib package.
+"""
+
+from unittest import TestCase
+from mock import MagicMock
+
+from PyQt4 import QtGui
+
+from openlp.core.lib import Registry, ScreenList
+from openlp.core.ui.mainwindow import MainWindow
+
+
+class TestStartNoteDialog(TestCase):
+
+    def setUp(self):
+        """
+        Create the UI
+        """
+        Registry.create()
+        self.app = QtGui.QApplication([])
+        ScreenList.create(self.app.desktop())
+        Registry().register(u'application', MagicMock())
+        self.main_window = MainWindow()
+        self.service_manager = Registry().get(u'service_manager')
+
+    def tearDown(self):
+        """
+        Delete all the C++ objects at the end so that we don't have a segfault
+        """
+        del self.main_window
+        del self.app
+
+    def basic_service_manager_test(self):
+        """
+        Test the Service Manager display functionality
+        """
+        # GIVEN: A New Service Manager instance
+
+        # WHEN I have an empty display
+        # THEN the count of items should be zero
+        self.assertEqual(self.service_manager.service_manager_list.topLevelItemCount(), 0,
+            u'The service manager list should be empty ')
diff --git a/tests/interfaces/openlp_core_ui/test_servicenotedialog.py b/tests/interfaces/openlp_core_ui/test_servicenotedialog.py
index f3694fdea..1cf3fef38 100644
--- a/tests/interfaces/openlp_core_ui/test_servicenotedialog.py
+++ b/tests/interfaces/openlp_core_ui/test_servicenotedialog.py
@@ -2,11 +2,13 @@
     Package to test the openlp.core.ui package.
 """
 from unittest import TestCase
-
 from mock import patch
+
+from PyQt4 import QtCore, QtGui, QtTest
+
 from openlp.core.lib import Registry
 from openlp.core.ui import servicenoteform
-from PyQt4 import QtCore, QtGui, QtTest
+
 
 class TestStartNoteDialog(TestCase):
 
diff --git a/tests/interfaces/openlp_core_ui/test_starttimedialog.py b/tests/interfaces/openlp_core_ui/test_starttimedialog.py
index a9b33a30c..888402235 100644
--- a/tests/interfaces/openlp_core_ui/test_starttimedialog.py
+++ b/tests/interfaces/openlp_core_ui/test_starttimedialog.py
@@ -2,11 +2,13 @@
     Package to test the openlp.core.ui package.
 """
 from unittest import TestCase
-
 from mock import MagicMock, patch
+
+from PyQt4 import QtCore, QtGui, QtTest
+
 from openlp.core.lib import Registry
 from openlp.core.ui import starttimeform
-from PyQt4 import QtCore, QtGui, QtTest
+
 
 class TestStartTimeDialog(TestCase):