diff --git a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_a.py b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_a.py
index bab3c7b14..1895f2bbe 100644
--- a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_a.py
+++ b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_a.py
@@ -8,12 +8,11 @@ class Depth1A(ConfigTemplate):
     config_values = copy(BaseTemplate.config_values)
     # TODO ADD SMB PTH machine
     # Tests:
-    # Hadoop
-    # Log4shell
-    # MSSQL
-    # SMB password stealing and brute force
-    # SSH password and key brute-force, key stealing
-    # Powershell credential reuse (powershell login with empty password)
+    # Hadoop (10.2.2.2, 10.2.2.3)
+    # Log4shell (10.2.3.55, 10.2.3.56, 10.2.3.49, 10.2.3.50, 10.2.3.51, 10.2.3.52)
+    # MSSQL (10.2.2.16)
+    # SMB mimikatz password stealing and brute force (10.2.2.14 and 10.2.2.15)
+    # Powershell credential reuse (powershell login with empty password) (10.2.3.46)
     config_values.update(
         {
             "basic.exploiters.exploiter_classes": [
diff --git a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_b.py b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_b.py
index 548f52349..3df42389a 100644
--- a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_b.py
+++ b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_1_b.py
@@ -7,7 +7,7 @@ from envs.monkey_zoo.blackbox.config_templates.config_template import ConfigTemp
 class Depth1B(ConfigTemplate):
     config_values = copy(BaseTemplate.config_values)
     # Tests:
-    # WMI + credential stealing
+    # WMI password login and mimikatz credential stealing (10.2.2.14 and 10.2.2.15)
     # Zerologon
     config_values.update(
         {
diff --git a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py
index 3f131694a..1a8ba8b5d 100644
--- a/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py
+++ b/envs/monkey_zoo/blackbox/config_templates/grouped/depth_3_a.py
@@ -8,9 +8,9 @@ class Depth3A(ConfigTemplate):
     config_values = copy(BaseTemplate.config_values)
 
     # Tests:
-    # Powershell
-    # Tunneling (SSH brute force)
-    # WMI mimikatz password stealing
+    # Powershell (10.2.3.45, 10.2.3.46, 10.2.3.47, 10.2.3.48)
+    # Tunneling (SSH brute force) (10.2.2.9, 10.2.1.10, 10.2.0.12, 10.2.0.11)
+    # WMI pass the hash (10.2.2.15)
     config_values.update(
         {
             "basic.exploiters.exploiter_classes": [