diff --git a/force_bdss/ui_hooks/base_ui_hook_manager.py b/force_bdss/ui_hooks/base_ui_hooks_manager.py
similarity index 87%
rename from force_bdss/ui_hooks/base_ui_hook_manager.py
rename to force_bdss/ui_hooks/base_ui_hooks_manager.py
index 5429fa7fab8454769c491b8abb95a7246d8003b7..ff71acc1da5595a3490778a9d1222777183b70ac 100644
--- a/force_bdss/ui_hooks/base_ui_hook_manager.py
+++ b/force_bdss/ui_hooks/base_ui_hooks_manager.py
@@ -4,7 +4,7 @@ from traits.api import ABCHasStrictTraits, Instance
 from .i_ui_hooks_factory import IUIHooksFactory
 
 
-class BaseUIHookManager(ABCHasStrictTraits):
+class BaseUIHooksManager(ABCHasStrictTraits):
     #: A reference to the factory
     factory = Instance(IUIHooksFactory)
 
@@ -17,9 +17,8 @@ class BaseUIHookManager(ABCHasStrictTraits):
             The factory this Notification Listener belongs to
         """
         self.factory = factory
-        super(BaseUIHookManager, self).__init__(*args, **kwargs)
+        super(BaseUIHooksManager, self).__init__(*args, **kwargs)
 
-    @abc.abstractmethod
     def before_execution(self, task):
         """Hook that is called before execution of a given evaluation.
         Gives a chance to perform operations before the temporary file is
@@ -31,7 +30,6 @@ class BaseUIHookManager(ABCHasStrictTraits):
             The pyface envisage task.
         """
 
-    @abc.abstractmethod
     def before_save(self, task):
         """Hook that is called just before saving a given model to disk
         in response to a user action. This does not apply to saving of
diff --git a/force_bdss/ui_hooks/tests/__init__.py b/force_bdss/ui_hooks/tests/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/force_bdss/ui_hooks/tests/test_base_ui_hooks_manager.py b/force_bdss/ui_hooks/tests/test_base_ui_hooks_manager.py
new file mode 100644
index 0000000000000000000000000000000000000000..f29d7d26c7493878d5f713dc953b7e956ae9e387
--- /dev/null
+++ b/force_bdss/ui_hooks/tests/test_base_ui_hooks_manager.py
@@ -0,0 +1,16 @@
+import unittest
+
+from ..base_ui_hooks_manager import BaseUIHooksManager
+from ..base_ui_hooks_factory import BaseUIHooksFactory
+try:
+    import mock
+except ImportError:
+    from unittest import mock
+
+
+class TestBaseUIHookManager(unittest.TestCase):
+    def test_initialization(self):
+        mock_factory = mock.Mock(spec=BaseUIHooksFactory)
+        mgr = BaseUIHooksManager(mock_factory)
+
+        self.assertEqual(mgr.factory, mock_factory)