diff --git a/tests/functional/openlp_core_lib/test_lib.py b/tests/functional/openlp_core_lib/test_lib.py
index 66cb834f1..c03a11265 100644
--- a/tests/functional/openlp_core_lib/test_lib.py
+++ b/tests/functional/openlp_core_lib/test_lib.py
@@ -15,7 +15,7 @@ class TestLib(TestCase):
         """
         Test the str_to_bool function with boolean input
         """
-        #GIVEN: A boolean value set to true
+        # GIVEN: A boolean value set to true
         true_boolean = True
 
         # WHEN: We "convert" it to a bool
@@ -25,7 +25,7 @@ class TestLib(TestCase):
         assert isinstance(true_result, bool), u'The result should be a boolean'
         assert true_result is True, u'The result should be True'
 
-        #GIVEN: A boolean value set to false
+        # GIVEN: A boolean value set to false
         false_boolean = False
 
         # WHEN: We "convert" it to a bool
diff --git a/tests/interfaces/openlp_plugins/__init__.pyc b/tests/interfaces/openlp_plugins/__init__.pyc
index 0d24c9eff..c96ac5c5c 100644
Binary files a/tests/interfaces/openlp_plugins/__init__.pyc and b/tests/interfaces/openlp_plugins/__init__.pyc differ
diff --git a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
index ebd12f49d..d5de9bff9 100644
--- a/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
+++ b/tests/interfaces/openlp_plugins/custom/forms/test_customform.py
@@ -46,7 +46,7 @@ class TestCustomFrom(TestCase):
             self.form.exec_()
             self.form.load_custom(0)
 
-            #THEN: The line edits should not contain any text.
+            # THEN: The line edits should not contain any text.
             self.assertEqual(self.form.title_edit.text(), u'', u'The title edit should be empty')
             self.assertEqual(self.form.credit_edit.text(), u'', u'The credit edit should be empty')
 
@@ -60,5 +60,19 @@ class TestCustomFrom(TestCase):
             # WHEN: Show the dialog and add a new slide.
             self.form.exec_()
             QtTest.QTest.mouseClick(self.form.add_button, QtCore.Qt.LeftButton)
-            #THEN: One slide should be added.
+            # THEN: One slide should be added.
             assert self.form.slide_list_view.count() == 1, u'There should be one slide added.'
+
+    def load_themes_test(self):
+        """
+        Test the load_themes() method.
+        """
+        # GIVEN: A mocked QDialog.exec_() method
+        with patch(u'PyQt4.QtGui.QDialog.exec_') as mocked_exec:
+            theme_list = [u'First Theme', u'Second Theme']
+            # WHEN: Show the dialog and add pass a theme list.
+            self.form.exec_()
+            self.form.load_themes(theme_list)
+
+            # THEN: There should be three items in the combo box.
+            assert self.form.theme_combo_box.count() == 3, u'There should be three items (themes) in the combo box.'