diff --git a/force_bdss/io/tests/test_workflow_writer.py b/force_bdss/io/tests/test_workflow_writer.py
index fc197c306921d8ff7fe6de1ecd6340249398b7c6..db58071091bc91e32c9b7b7168a7517bcf98fcc5 100644
--- a/force_bdss/io/tests/test_workflow_writer.py
+++ b/force_bdss/io/tests/test_workflow_writer.py
@@ -57,7 +57,6 @@ class TestWorkflowWriter(unittest.TestCase):
         self.assertIn("workflow", result)
         self.assertIn("mco", result["workflow"])
         self.assertIn("execution_layers", result["workflow"])
-        self.assertIn("kpi_calculators", result["workflow"])
 
     def test_write_and_read(self):
         wfwriter = WorkflowWriter()
diff --git a/force_bdss/tests/test_core_evaluation_driver.py b/force_bdss/tests/test_core_evaluation_driver.py
index 62d6a9b034226607db04667063541c9d116f0f1b..ffbbf86b32c1e23e9b49ad89758eaf9a11c11460 100644
--- a/force_bdss/tests/test_core_evaluation_driver.py
+++ b/force_bdss/tests/test_core_evaluation_driver.py
@@ -180,7 +180,6 @@ class TestCoreEvaluationDriver(unittest.TestCase):
         res = _compute_layer_results(
             data_values,
             [evaluator_model],
-            "create_data_source"
         )
         self.assertEqual(len(res), 2)
         self.assertEqual(res[0].name, "one")
@@ -289,7 +288,7 @@ class TestCoreEvaluationDriver(unittest.TestCase):
             InputSlotInfo(name="res2")
         ]
         model.output_slot_info = [
-            OutputSlotInfo(name="out1")
+            OutputSlotInfo(name="out1", is_kpi=True)
         ]
         wf.execution_layers[3].append(model)
 
diff --git a/force_bdss/tests/test_factory_registry_plugin.py b/force_bdss/tests/test_factory_registry_plugin.py
index 2a20fbd7d74198e908fcaf6b80380d9e6d8873e3..459050fa11b802a5977cde2436fa314493422946 100644
--- a/force_bdss/tests/test_factory_registry_plugin.py
+++ b/force_bdss/tests/test_factory_registry_plugin.py
@@ -31,7 +31,6 @@ class TestFactoryRegistry(unittest.TestCase):
     def test_initialization(self):
         self.assertEqual(self.plugin.mco_factories, [])
         self.assertEqual(self.plugin.data_source_factories, [])
-        self.assertEqual(self.plugin.kpi_calculator_factories, [])
 
 
 class MySuperPlugin(BaseExtensionPlugin):