diff --git a/force_bdss/base_extension_plugin.py b/force_bdss/base_extension_plugin.py
index 659fbecdab8b0333e9fe0a5f3a3f1494712a470e..12017a4dab7ca2531c2c4e8ef01b3bff4e3ef8d6 100644
--- a/force_bdss/base_extension_plugin.py
+++ b/force_bdss/base_extension_plugin.py
@@ -55,8 +55,7 @@ class BaseExtensionPlugin(Plugin):
         Either(Type(BaseDataSourceFactory),
                Type(BaseMCOFactory),
                Type(BaseNotificationListenerFactory),
-               Type(BaseUIHooksFactory)
-        )
+               Type(BaseUIHooksFactory))
     )
 
     #: A list of available Multi Criteria Optimizers this plugin exports.
diff --git a/force_bdss/tests/test_base_extension_plugin.py b/force_bdss/tests/test_base_extension_plugin.py
index 50534993da47f60efc448706a264f8aae2199f55..7e078f64bfb5e8713446456aba49fe1ecd2b8f16 100644
--- a/force_bdss/tests/test_base_extension_plugin.py
+++ b/force_bdss/tests/test_base_extension_plugin.py
@@ -3,11 +3,6 @@ import unittest
 from force_bdss.tests.probe_classes.probe_extension_plugin import \
     ProbeExtensionPlugin
 
-try:
-    import mock
-except ImportError:
-    from unittest import mock
-
 
 class TestBaseExtensionPlugin(unittest.TestCase):
     def test_basic_init(self):
diff --git a/force_bdss/tests/test_factory_registry_plugin.py b/force_bdss/tests/test_factory_registry_plugin.py
index 6eacb4b6624fe130ef81f6f238c0cda866d36f30..ff657d03fb28460c46d0af80eded2a7d2d5716b1 100644
--- a/force_bdss/tests/test_factory_registry_plugin.py
+++ b/force_bdss/tests/test_factory_registry_plugin.py
@@ -12,8 +12,6 @@ from force_bdss.mco.parameters.base_mco_parameter_factory import \
 from force_bdss.notification_listeners.base_notification_listener_factory \
     import \
     BaseNotificationListenerFactory
-from force_bdss.notification_listeners.i_notification_listener_factory import \
-    INotificationListenerFactory
 
 try:
     import mock
@@ -23,8 +21,6 @@ except ImportError:
 from envisage.application import Application
 
 from force_bdss.factory_registry_plugin import FactoryRegistryPlugin
-from force_bdss.data_sources.i_data_source_factory import IDataSourceFactory
-from force_bdss.mco.i_mco_factory import IMCOFactory
 
 
 class TestFactoryRegistry(unittest.TestCase):