diff --git a/doc/source/api/force_bdss.cli.rst b/doc/source/api/force_bdss.cli.rst
index 6bcf4b3ba2666f351f9b1cd8f9148ec183490895..c96292e6712e3cb76369b1c4c59ddfe58c7c3e3f 100644
--- a/doc/source/api/force_bdss.cli.rst
+++ b/doc/source/api/force_bdss.cli.rst
@@ -1,6 +1,13 @@
 force_bdss.cli package
 ======================
 
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.cli.tests
+
 Submodules
 ----------
 
diff --git a/doc/source/api/force_bdss.cli.tests.rst b/doc/source/api/force_bdss.cli.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..5fef4d6bb9516d1e822af0255e1b311b0b77ea98
--- /dev/null
+++ b/doc/source/api/force_bdss.cli.tests.rst
@@ -0,0 +1,22 @@
+force_bdss.cli.tests package
+============================
+
+Submodules
+----------
+
+force_bdss.cli.tests.test_execution module
+------------------------------------------
+
+.. automodule:: force_bdss.cli.tests.test_execution
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.cli.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst
new file mode 100644
index 0000000000000000000000000000000000000000..74c22bbf83eb1253bac59fb763d7bfde0c83cee4
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy_kpi.kpi_adder.rst
@@ -0,0 +1,38 @@
+force_bdss.core_plugins.dummy_kpi.kpi_adder package
+===================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_bundle module
+-------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_calculator module
+-----------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_calculator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_model module
+------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder.kpi_adder_model
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi.kpi_adder
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst b/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst
new file mode 100644
index 0000000000000000000000000000000000000000..65df6152c71a9b0636cd111adaeef0505c4f5b16
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy_kpi.rst
@@ -0,0 +1,29 @@
+force_bdss.core_plugins.dummy_kpi package
+=========================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy_kpi.kpi_adder
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy_kpi.dummy_kpi_calculator_plugin module
+--------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi.dummy_kpi_calculator_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy_kpi
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst b/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst
new file mode 100644
index 0000000000000000000000000000000000000000..0fb9f293acb6bf09e1c563b2b3d7ac990d5d7c7a
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy_mco.dakota.rst
@@ -0,0 +1,46 @@
+force_bdss.core_plugins.dummy_mco.dakota package
+================================================
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy_mco.dakota.dakota_bundle module
+-------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_bundle
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy_mco.dakota.dakota_communicator module
+-------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_communicator
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy_mco.dakota.dakota_model module
+------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_model
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.core_plugins.dummy_mco.dakota.dakota_optimizer module
+----------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.dakota.dakota_optimizer
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.dakota
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.dummy_mco.rst b/doc/source/api/force_bdss.core_plugins.dummy_mco.rst
new file mode 100644
index 0000000000000000000000000000000000000000..fdd8c5d18c6dbb0ee97c7d335c353723f5c000fd
--- /dev/null
+++ b/doc/source/api/force_bdss.core_plugins.dummy_mco.rst
@@ -0,0 +1,29 @@
+force_bdss.core_plugins.dummy_mco package
+=========================================
+
+Subpackages
+-----------
+
+.. toctree::
+
+    force_bdss.core_plugins.dummy_mco.dakota
+
+Submodules
+----------
+
+force_bdss.core_plugins.dummy_mco.multi_criteria_optimizers_plugin module
+-------------------------------------------------------------------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco.multi_criteria_optimizers_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.core_plugins.dummy_mco
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.rst b/doc/source/api/force_bdss.core_plugins.rst
index 6b46617c8d52992d5a1761a284c4c07d88a0d5e2..329a28dc7a9635e8f400a52ec569eb5bb2467266 100644
--- a/doc/source/api/force_bdss.core_plugins.rst
+++ b/doc/source/api/force_bdss.core_plugins.rst
@@ -7,8 +7,8 @@ Subpackages
 .. toctree::
 
     force_bdss.core_plugins.csv_extractor
-    force_bdss.core_plugins.test_kpi
-    force_bdss.core_plugins.test_mco
+    force_bdss.core_plugins.dummy_kpi
+    force_bdss.core_plugins.dummy_mco
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.core_plugins.test_kpi.kpi_adder.rst b/doc/source/api/force_bdss.core_plugins.test_kpi.kpi_adder.rst
deleted file mode 100644
index 7fb4768ee6f5248962eef54112e3dd232618e021..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.test_kpi.kpi_adder.rst
+++ /dev/null
@@ -1,38 +0,0 @@
-force_bdss.core_plugins.test_kpi.kpi_adder package
-==================================================
-
-Submodules
-----------
-
-force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_bundle module
-------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_bundle
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_calculator module
-----------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_calculator
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_model module
------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi.kpi_adder.kpi_adder_model
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi.kpi_adder
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.test_kpi.rst b/doc/source/api/force_bdss.core_plugins.test_kpi.rst
deleted file mode 100644
index 28cce98cd0ae1c4978d7d9d8256f5b64165d41a8..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.test_kpi.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-force_bdss.core_plugins.test_kpi package
-========================================
-
-Subpackages
------------
-
-.. toctree::
-
-    force_bdss.core_plugins.test_kpi.kpi_adder
-
-Submodules
-----------
-
-force_bdss.core_plugins.test_kpi.test_kpi_calculator_plugin module
-------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi.test_kpi_calculator_plugin
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.test_kpi
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.test_mco.dakota.rst b/doc/source/api/force_bdss.core_plugins.test_mco.dakota.rst
deleted file mode 100644
index 09975c90adfe3ee9328dd4203cc7a523adb85f8f..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.test_mco.dakota.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-force_bdss.core_plugins.test_mco.dakota package
-===============================================
-
-Submodules
-----------
-
-force_bdss.core_plugins.test_mco.dakota.dakota_bundle module
-------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.dakota.dakota_bundle
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-force_bdss.core_plugins.test_mco.dakota.dakota_communicator module
-------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.dakota.dakota_communicator
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-force_bdss.core_plugins.test_mco.dakota.dakota_model module
------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.dakota.dakota_model
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-force_bdss.core_plugins.test_mco.dakota.dakota_optimizer module
----------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.dakota.dakota_optimizer
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.dakota
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/api/force_bdss.core_plugins.test_mco.rst b/doc/source/api/force_bdss.core_plugins.test_mco.rst
deleted file mode 100644
index cdeb500d2ff7c7cb868065bb1ec06fd16a22298b..0000000000000000000000000000000000000000
--- a/doc/source/api/force_bdss.core_plugins.test_mco.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-force_bdss.core_plugins.test_mco package
-========================================
-
-Subpackages
------------
-
-.. toctree::
-
-    force_bdss.core_plugins.test_mco.dakota
-
-Submodules
-----------
-
-force_bdss.core_plugins.test_mco.multi_criteria_optimizers_plugin module
-------------------------------------------------------------------------
-
-.. automodule:: force_bdss.core_plugins.test_mco.multi_criteria_optimizers_plugin
-    :members:
-    :undoc-members:
-    :show-inheritance:
-
-
-Module contents
----------------
-
-.. automodule:: force_bdss.core_plugins.test_mco
-    :members:
-    :undoc-members:
-    :show-inheritance:
diff --git a/doc/source/api/force_bdss.rst b/doc/source/api/force_bdss.rst
index 4521bdf713ec76ea51a05990961f7e57503cfac5..31df6d0610d037019ac8faeba8d96a256f27eb0e 100644
--- a/doc/source/api/force_bdss.rst
+++ b/doc/source/api/force_bdss.rst
@@ -11,11 +11,20 @@ Subpackages
     force_bdss.data_sources
     force_bdss.kpi
     force_bdss.mco
+    force_bdss.tests
     force_bdss.workspecs
 
 Submodules
 ----------
 
+force_bdss.api module
+---------------------
+
+.. automodule:: force_bdss.api
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.base_core_driver module
 ----------------------------------
 
@@ -24,6 +33,14 @@ force_bdss.base_core_driver module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.base_extension_plugin module
+---------------------------------------
+
+.. automodule:: force_bdss.base_extension_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.bdss_application module
 ----------------------------------
 
@@ -32,6 +49,14 @@ force_bdss.bdss_application module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.bundle_registry_plugin module
+----------------------------------------
+
+.. automodule:: force_bdss.bundle_registry_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 force_bdss.core_evaluation_driver module
 ----------------------------------------
 
@@ -48,6 +73,14 @@ force_bdss.core_mco_driver module
     :undoc-members:
     :show-inheritance:
 
+force_bdss.id_generators module
+-------------------------------
+
+.. automodule:: force_bdss.id_generators
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 
 Module contents
 ---------------
diff --git a/doc/source/api/force_bdss.tests.rst b/doc/source/api/force_bdss.tests.rst
new file mode 100644
index 0000000000000000000000000000000000000000..d564d7cd14fb3d5fcb6ed86223dea8f31774433f
--- /dev/null
+++ b/doc/source/api/force_bdss.tests.rst
@@ -0,0 +1,30 @@
+force_bdss.tests package
+========================
+
+Submodules
+----------
+
+force_bdss.tests.test_bundle_registry_plugin module
+---------------------------------------------------
+
+.. automodule:: force_bdss.tests.test_bundle_registry_plugin
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+force_bdss.tests.test_id_generators module
+------------------------------------------
+
+.. automodule:: force_bdss.tests.test_id_generators
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Module contents
+---------------
+
+.. automodule:: force_bdss.tests
+    :members:
+    :undoc-members:
+    :show-inheritance:
diff --git a/force_bdss/core_plugins/test_kpi/__init__.py b/force_bdss/core_plugins/dummy_kpi/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/test_kpi/__init__.py
rename to force_bdss/core_plugins/dummy_kpi/__init__.py
diff --git a/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py b/force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py
similarity index 77%
rename from force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py
rename to force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py
index 9c7ca3af6aa72c21cbefff12bdc2aea96247d097..1e427722e65776c7a016c03227be085fba7bd57e 100644
--- a/force_bdss/core_plugins/test_kpi/test_kpi_calculator_plugin.py
+++ b/force_bdss/core_plugins/dummy_kpi/dummy_kpi_calculator_plugin.py
@@ -3,6 +3,6 @@ from force_bdss.api import BaseExtensionPlugin
 from .kpi_adder.kpi_adder_bundle import KPIAdderBundle
 
 
-class TestKPICalculatorPlugin(BaseExtensionPlugin):
+class DummyKPICalculatorPlugin(BaseExtensionPlugin):
     def _kpi_calculator_bundles_default(self):
         return [KPIAdderBundle()]
diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/__init__.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/test_kpi/kpi_adder/__init__.py
rename to force_bdss/core_plugins/dummy_kpi/kpi_adder/__init__.py
diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
similarity index 100%
rename from force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_bundle.py
rename to force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_bundle.py
diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_calculator.py
similarity index 100%
rename from force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_calculator.py
rename to force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_calculator.py
diff --git a/force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py b/force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_model.py
similarity index 100%
rename from force_bdss/core_plugins/test_kpi/kpi_adder/kpi_adder_model.py
rename to force_bdss/core_plugins/dummy_kpi/kpi_adder/kpi_adder_model.py
diff --git a/force_bdss/core_plugins/test_mco/__init__.py b/force_bdss/core_plugins/dummy_mco/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/__init__.py
rename to force_bdss/core_plugins/dummy_mco/__init__.py
diff --git a/force_bdss/core_plugins/test_mco/dakota/__init__.py b/force_bdss/core_plugins/dummy_mco/dakota/__init__.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/dakota/__init__.py
rename to force_bdss/core_plugins/dummy_mco/dakota/__init__.py
diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/dakota/dakota_bundle.py
rename to force_bdss/core_plugins/dummy_mco/dakota/dakota_bundle.py
diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_communicator.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/dakota/dakota_communicator.py
rename to force_bdss/core_plugins/dummy_mco/dakota/dakota_communicator.py
diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_model.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_model.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/dakota/dakota_model.py
rename to force_bdss/core_plugins/dummy_mco/dakota/dakota_model.py
diff --git a/force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py b/force_bdss/core_plugins/dummy_mco/dakota/dakota_optimizer.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/dakota/dakota_optimizer.py
rename to force_bdss/core_plugins/dummy_mco/dakota/dakota_optimizer.py
diff --git a/force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py b/force_bdss/core_plugins/dummy_mco/multi_criteria_optimizers_plugin.py
similarity index 100%
rename from force_bdss/core_plugins/test_mco/multi_criteria_optimizers_plugin.py
rename to force_bdss/core_plugins/dummy_mco/multi_criteria_optimizers_plugin.py
diff --git a/setup.py b/setup.py
index 893b7fe7c134bc6f7fc06085988a89a0a5e38f81..b51e52c65136f7effd73959a38dd1ff7010c4568 100644
--- a/setup.py
+++ b/setup.py
@@ -10,12 +10,12 @@ setup(
             'force_bdss = force_bdss.cli.force_bdss:run',
         ],
         "force.bdss.extensions": [
-            "mco = force_bdss.core_plugins.test_mco."
+            "mco = force_bdss.core_plugins.dummy_mco."
             "multi_criteria_optimizers_plugin:MultiCriteriaOptimizersPlugin",
             "csv_extractor = force_bdss.core_plugins.csv_extractor"
             ".csv_extractor_plugin:CSVExtractorPlugin",
-            "kpi_adder = force_bdss.core_plugins.test_kpi"
-            ".test_kpi_calculator_plugin:TestKPICalculatorPlugin",
+            "kpi_adder = force_bdss.core_plugins.dummy_kpi"
+            ".dummy_kpi_calculator_plugin:DummyKPICalculatorPlugin",
         ]
     },
     packages=find_packages(),