diff --git a/envs/monkey_zoo/blackbox/test_blackbox.py b/envs/monkey_zoo/blackbox/test_blackbox.py
index 82cd0f0ad..04e510c55 100644
--- a/envs/monkey_zoo/blackbox/test_blackbox.py
+++ b/envs/monkey_zoo/blackbox/test_blackbox.py
@@ -7,6 +7,7 @@ from time import sleep
 from envs.monkey_zoo.blackbox.island_client.monkey_island_client import MonkeyIslandClient
 from envs.monkey_zoo.blackbox.analyzers.communication_analyzer import CommunicationAnalyzer
 from envs.monkey_zoo.blackbox.island_client.island_config_parser import IslandConfigParser
+from envs.monkey_zoo.blackbox.tests.performance.map_generation import MapGenerationTest
 from envs.monkey_zoo.blackbox.tests.performance.report_generation import ReportGenerationTest
 from envs.monkey_zoo.blackbox.utils import gcp_machine_handlers
 from envs.monkey_zoo.blackbox.tests.exploitation import ExploitationTest
@@ -24,7 +25,7 @@ LOGGER = logging.getLogger(__name__)
 @pytest.fixture(autouse=True, scope='session')
 def GCPHandler(request):
     GCPHandler = gcp_machine_handlers.GCPHandler()
-    #GCPHandler.start_machines(" ".join(GCP_TEST_MACHINE_LIST))
+    GCPHandler.start_machines(" ".join(GCP_TEST_MACHINE_LIST))
     wait_machine_bootup()
 
     def fin():
@@ -74,13 +75,13 @@ class TestMonkeyBlackbox(object):
         log_handler = TestLogsHandler(performance_test_class.TEST_NAME,
                                       island_client,
                                       TestMonkeyBlackbox.get_log_dir_path())
-        analyzer = CommunicationAnalyzer(island_client, config_parser.get_ips_of_targets())
-        performance_test_class.__init__(island_client=island_client,
-                                        config_parser=config_parser,
-                                        analyzers=analyzer,
-                                        timeout=timeout_in_seconds,
-                                        log_handler=log_handler,
-                                        break_on_timeout=break_on_timeout).run()
+        analyzers = [CommunicationAnalyzer(island_client, config_parser.get_ips_of_targets())]
+        performance_test_class(island_client=island_client,
+                               config_parser=config_parser,
+                               analyzers=analyzers,
+                               timeout=timeout_in_seconds,
+                               log_handler=log_handler,
+                               break_on_timeout=break_on_timeout).run()
 
     @staticmethod
     def get_log_dir_path():
@@ -89,41 +90,41 @@ class TestMonkeyBlackbox(object):
     def test_server_online(self, island_client):
         assert island_client.get_api_status() is not None
 
-    #def test_ssh_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "SSH.conf", "SSH_exploiter_and_keys")
-#
-    #def test_hadoop_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "HADOOP.conf", "Hadoop_exploiter", 6 * 60)
-#
-    #def test_mssql_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "MSSQL.conf", "MSSQL_exploiter")
-#
-    #def test_smb_and_mimikatz_exploiters(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "SMB_MIMIKATZ.conf", "SMB_exploiter_mimikatz")
-#
-    #def test_smb_pth(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "SMB_PTH.conf", "SMB_PTH")
-#
-    #def test_elastic_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "ELASTIC.conf", "Elastic_exploiter")
-#
-    #def test_struts_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "STRUTS2.conf", "Strtuts2_exploiter")
-#
-    #def test_weblogic_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "WEBLOGIC.conf", "Weblogic_exploiter")
-#
-    #def test_shellshock_exploiter(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "SHELLSHOCK.conf", "Shellschock_exploiter")
-#
-    #def test_tunneling(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "TUNNELING.conf", "Tunneling_exploiter", 15 * 60)
-#
-    #def test_wmi_and_mimikatz_exploiters(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "WMI_MIMIKATZ.conf", "WMI_exploiter,_mimikatz")
-#
-    #def test_wmi_pth(self, island_client):
-    #    TestMonkeyBlackbox.run_exploitation_test(island_client, "WMI_PTH.conf", "WMI_PTH")
+    def test_ssh_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "SSH.conf", "SSH_exploiter_and_keys")
+
+    def test_hadoop_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "HADOOP.conf", "Hadoop_exploiter", 6 * 60)
+
+    def test_mssql_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "MSSQL.conf", "MSSQL_exploiter")
+
+    def test_smb_and_mimikatz_exploiters(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "SMB_MIMIKATZ.conf", "SMB_exploiter_mimikatz")
+
+    def test_smb_pth(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "SMB_PTH.conf", "SMB_PTH")
+
+    def test_elastic_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "ELASTIC.conf", "Elastic_exploiter")
+
+    def test_struts_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "STRUTS2.conf", "Strtuts2_exploiter")
+
+    def test_weblogic_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "WEBLOGIC.conf", "Weblogic_exploiter")
+
+    def test_shellshock_exploiter(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "SHELLSHOCK.conf", "Shellschock_exploiter")
+
+    def test_tunneling(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "TUNNELING.conf", "Tunneling_exploiter", 15 * 60)
+
+    def test_wmi_and_mimikatz_exploiters(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "WMI_MIMIKATZ.conf", "WMI_exploiter,_mimikatz")
+
+    def test_wmi_pth(self, island_client):
+        TestMonkeyBlackbox.run_exploitation_test(island_client, "WMI_PTH.conf", "WMI_PTH")
 
     def test_report_generation_performance(self, island_client):
         """
@@ -137,3 +138,10 @@ class TestMonkeyBlackbox(object):
                                                 island_client,
                                                 "PERFORMANCE.conf",
                                                 timeout_in_seconds=10*60)
+
+    def test_map_generation_performance(self, island_client):
+        TestMonkeyBlackbox.run_performance_test(MapGenerationTest,
+                                                island_client,
+                                                "PERFORMANCE.conf",
+                                                timeout_in_seconds=10*60)
+
diff --git a/envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py b/envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py
index dc2b6b0c7..76a389efd 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/endpoint_performance_test.py
@@ -39,4 +39,4 @@ class EndpointPerformanceTest(BasicTest):
         else:
             LOGGER.error(f"Trying to get {url} but got unexpected {str(response)}")
             # instead of raising for status, mark failed responses as maxtime
-            return timedelta.max()
+            return timedelta.max
diff --git a/envs/monkey_zoo/blackbox/tests/performance/map_generation.py b/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
index 782bf82fe..c597907f4 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/map_generation.py
@@ -9,7 +9,7 @@ MAX_ALLOWED_SINGLE_PAGE_TIME = timedelta(seconds=2)
 MAX_ALLOWED_TOTAL_TIME = timedelta(seconds=5)
 
 MAP_RESOURCES = [
-    "api/map",
+    "api/netmap",
 ]
 
 
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 e496c09a5..3157140a9 100644
--- a/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
+++ b/envs/monkey_zoo/blackbox/tests/performance/performance_test_workflow.py
@@ -23,7 +23,9 @@ class PerformanceTestWorkflow(BasicTest):
             self.island_client.kill_all_monkeys()
             self.exploitation_test.wait_until_monkeys_die()
             self.exploitation_test.wait_for_monkey_process_to_finish()
-            performance_test = EndpointPerformanceTest(self.name, self.performance_config, self.island_client)
-            performance_test.run()
+        performance_test = EndpointPerformanceTest(self.name, self.performance_config, self.island_client)
+        try:
+            assert performance_test.run()
+        finally:
             self.exploitation_test.parse_logs()
             self.island_client.reset_env()