diff --git a/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener.py b/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener.py
index 0a71a10b37e37a3f19e95bdabaf48c60c69a35bc..82741a48cbf9da91e31916eddc5aa17505640bb2 100644
--- a/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener.py
+++ b/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener.py
@@ -1,6 +1,6 @@
 import unittest
 
-from force_bdss.api import BaseMCOEvent
+from force_bdss.api import MCOStartEvent, MCOProgressEvent, MCOFinishEvent
 from force_bdss.notification_listeners.base_notification_listener_factory \
     import \
     BaseNotificationListenerFactory
@@ -24,11 +24,14 @@ class TestDummyNotificationListener(unittest.TestCase):
         listener = DummyNotificationListener(
             mock.Mock(spec=BaseNotificationListenerFactory))
         model = mock.Mock(spec=BaseNotificationListenerModel)
-        event = mock.Mock(spec=BaseMCOEvent)
         with captured_output() as (out, err):
             listener.initialize(model)
-            listener.deliver(event)
+            listener.deliver(MCOStartEvent())
+            listener.deliver(MCOProgressEvent())
+            listener.deliver(MCOFinishEvent())
             listener.finalize()
 
-        self.assertEqual(out.getvalue(),
-                         "Initializing\nBaseMCOEvent\nFinalizing\n")
+        self.assertEqual(
+            out.getvalue(),
+            "Initializing\nMCOStartEvent\nMCOProgressEvent () ()\n"
+            "MCOFinishEvent\nFinalizing\n")
diff --git a/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener_factory.py b/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener_factory.py
index 2df47b1f5754eef9f25c59dd52f77fcb4cd4fe19..10af546d7900afe7559f1cea610b8e744140eee2 100644
--- a/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener_factory.py
+++ b/force_bdss/core_plugins/dummy/dummy_notification_listener/tests/test_dummy_notification_listener_factory.py
@@ -19,5 +19,8 @@ class TestDummyNotificationListenerFactory(unittest.TestCase):
         model = factory.create_model()
         self.assertEqual(model.factory, factory)
 
+        model = factory.create_model({})
+        self.assertEqual(model.factory, factory)
+
         listener = factory.create_listener()
         self.assertEqual(listener.factory, factory)
diff --git a/force_bdss/core_plugins/dummy/ui_notification/tests/test_ui_notification_factory.py b/force_bdss/core_plugins/dummy/ui_notification/tests/test_ui_notification_factory.py
new file mode 100644
index 0000000000000000000000000000000000000000..b56c5c95f14fcadd4fffe273ce746533be37b09c
--- /dev/null
+++ b/force_bdss/core_plugins/dummy/ui_notification/tests/test_ui_notification_factory.py
@@ -0,0 +1,40 @@
+import unittest
+
+from envisage.plugin import Plugin
+
+from force_bdss.core_plugins.dummy.ui_notification.ui_notification import \
+    UINotification
+from force_bdss.core_plugins.dummy.ui_notification.ui_notification_factory \
+    import \
+    UINotificationFactory
+from force_bdss.core_plugins.dummy.ui_notification.ui_notification_model \
+    import \
+    UINotificationModel
+
+try:
+    import mock
+except ImportError:
+    from unittest import mock
+
+
+class TestUINotificationFactory(unittest.TestCase):
+    def test_initialization(self):
+        factory = UINotificationFactory(mock.Mock(spec=Plugin))
+        self.assertEqual(
+            factory.id,
+            "force.bdss.enthought.factory.ui_notification")
+
+    def test_create_model(self):
+        factory = UINotificationFactory(mock.Mock(spec=Plugin))
+        model = factory.create_model()
+        self.assertIsInstance(model, UINotificationModel)
+        self.assertEqual(model.factory, factory)
+
+        model = factory.create_model({})
+        self.assertIsInstance(model, UINotificationModel)
+        self.assertEqual(model.factory, factory)
+
+    def test_create_listener(self):
+        factory = UINotificationFactory(mock.Mock(spec=Plugin))
+        listener = factory.create_listener()
+        self.assertIsInstance(listener, UINotification)
diff --git a/force_bdss/io/tests/test_workflow_reader.py b/force_bdss/io/tests/test_workflow_reader.py
index b0704c45766410731a52a6e3a6e535ab1a5eb0dc..8ff216d88a04897742bcafbdd28094c40d1c54f8 100644
--- a/force_bdss/io/tests/test_workflow_reader.py
+++ b/force_bdss/io/tests/test_workflow_reader.py
@@ -39,6 +39,15 @@ class TestWorkflowReader(unittest.TestCase):
         with self.assertRaises(InvalidFileException):
             self.wfreader.read(self._as_json_stringio(data))
 
+    def test_missing_key(self):
+        data = {
+            "version": "1",
+            "workflow": {}
+        }
+
+        with self.assertRaises(InvalidFileException):
+            self.wfreader.read(self._as_json_stringio(data))
+
     def _as_json_stringio(self, data):
         fp = StringIO()
         json.dump(data, fp)