diff --git a/envs/monkey_zoo/blackbox/tests/exploitation.py b/envs/monkey_zoo/blackbox/tests/exploitation.py
index 2d55f2294..d6332bc75 100644
--- a/envs/monkey_zoo/blackbox/tests/exploitation.py
+++ b/envs/monkey_zoo/blackbox/tests/exploitation.py
@@ -1,6 +1,7 @@
 import logging
 from time import sleep
 
+from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
 from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
 from envs.monkey_zoo.blackbox.utils.test_timer import TestTimer
 
@@ -13,16 +14,16 @@ LOGGER = logging.getLogger(__name__)
 
 class ExploitationTest(BasicTest):
 
-    def __init__(self, name, island_client, config_parser, analyzers, timeout, log_handler):
+    def __init__(self, name, island_client, raw_config, analyzers, timeout, log_handler):
         self.name = name
         self.island_client = island_client
-        self.config_parser = config_parser
+        self.raw_config = raw_config
         self.analyzers = analyzers
         self.timeout = timeout
         self.log_handler = log_handler
 
     def run(self):
-        self.island_client.import_config(self.config_parser.config_raw)
+        self.island_client.import_config(self.raw_config)
         self.print_test_starting_info()
         try:
             self.island_client.run_monkey_local()
@@ -36,7 +37,8 @@ class ExploitationTest(BasicTest):
 
     def print_test_starting_info(self):
         LOGGER.info("Started {} test".format(self.name))
-        LOGGER.info("Machines participating in test: " + ", ".join(self.config_parser.get_ips_of_targets()))
+        machine_list = ", ".join(IslandConfigParser.get_ips_of_targets(self.raw_config))
+        LOGGER.info(f"Machines participating in test: {machine_list}")
         print("")
 
     def test_until_timeout(self):
diff --git a/envs/monkey_zoo/blackbox/tests/performance/map_generation.py b/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
index eb95fdc6a..42d2265e7 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
@@ -17,12 +17,11 @@ class MapGenerationTest(PerformanceTest):
 
     TEST_NAME = "Map generation performance test"
 
-    def __init__(self, island_client, config_parser, analyzers,
+    def __init__(self, island_client, raw_config, analyzers,
                  timeout, log_handler, break_on_timeout):
         self.island_client = island_client
-        self.config_parser = config_parser
         exploitation_test = ExploitationTest(MapGenerationTest.TEST_NAME, island_client,
-                                             config_parser, analyzers, timeout, log_handler)
+                                             raw_config, analyzers, timeout, log_handler)
         performance_config = PerformanceTestConfig(max_allowed_single_page_time=MAX_ALLOWED_SINGLE_PAGE_TIME,
                                                    max_allowed_total_time=MAX_ALLOWED_TOTAL_TIME,
                                                    endpoints_to_test=MAP_RESOURCES,
diff --git a/envs/monkey_zoo/blackbox/tests/performance/performance_test.py b/envs/monkey_zoo/blackbox/tests/performance/performance_test.py
index b26c20f93..dd6af8065 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/performance_test.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/performance_test.py
@@ -6,7 +6,7 @@ from envs.monkey_zoo.blackbox.tests.basic_test import BasicTest
 class PerformanceTest(BasicTest, metaclass=ABCMeta):
 
     @abstractmethod
-    def __init__(self, island_client, config_parser, analyzers,
+    def __init__(self, island_client, raw_config, analyzers,
                  timeout, log_handler, break_on_timeout):
         pass
 
diff --git a/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py b/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
index 4e708ed9d..7799e3d29 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
@@ -10,11 +10,11 @@ class PerformanceTestWorkflow(BasicTest):
         self.name = name
         self.exploitation_test = exploitation_test
         self.island_client = exploitation_test.island_client
-        self.config_parser = exploitation_test.config_parser
+        self.raw_config = exploitation_test.raw_config
         self.performance_config = performance_config
 
     def run(self):
-        self.island_client.import_config(self.config_parser.config_raw)
+        self.island_client.import_config(self.raw_config)
         self.exploitation_test.print_test_starting_info()
         try:
             self.island_client.run_monkey_local()
diff --git a/envs/monkey_zoo/blackbox/tests/performance/report_generation.py b/envs/monkey_zoo/blackbox/tests/performance/report_generation.py
index e204cc29f..f05661682 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/report_generation.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/report_generation.py
@@ -20,12 +20,11 @@ REPORT_RESOURCES = [
 class ReportGenerationTest(PerformanceTest):
     TEST_NAME = "Report generation performance test"
 
-    def __init__(self, island_client, config_parser, analyzers,
+    def __init__(self, island_client, raw_config, analyzers,
                  timeout, log_handler, break_on_timeout):
         self.island_client = island_client
-        self.config_parser = config_parser
         exploitation_test = ExploitationTest(ReportGenerationTest.TEST_NAME, island_client,
-                                             config_parser, analyzers, timeout, log_handler)
+                                             raw_config, analyzers, timeout, log_handler)
         performance_config = PerformanceTestConfig(max_allowed_single_page_time=MAX_ALLOWED_SINGLE_PAGE_TIME,
                                                    max_allowed_total_time=MAX_ALLOWED_TOTAL_TIME,
                                                    endpoints_to_test=REPORT_RESOURCES,