diff --git a/tests/assets/configs/test_application_install.yaml b/tests/assets/configs/test_application_install.yaml
index c1908fc4..1bf88277 100644
--- a/tests/assets/configs/test_application_install.yaml
+++ b/tests/assets/configs/test_application_install.yaml
@@ -258,12 +258,8 @@ agents:
         - type: NODE_SHUTDOWN
         - type: NODE_STARTUP
         - type: NODE_RESET
-        - type: NETWORK_ACL_ADDRULE
-          options:
-            target_router_hostname: router_1
-        - type: NETWORK_ACL_REMOVERULE
-          options:
-            target_router_hostname: router_1
+        - type: ROUTER_ACL_ADDRULE
+        - type: ROUTER_ACL_REMOVERULE
         - type: NETWORK_NIC_ENABLE
         - type: NETWORK_NIC_DISABLE
         - type: NODE_APPLICATION_INSTALL
@@ -480,8 +476,9 @@ agents:
               node_id: 6
 
           46: # old action num: 22 # "ACL: ADDRULE - Block outgoing traffic from client 1"
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 1
                 permission: 2
                 source_ip_id: 7 # client 1
@@ -490,8 +487,9 @@ agents:
                 dest_port_id: 1
                 protocol_id: 1
           47: # old action num: 23 # "ACL: ADDRULE - Block outgoing traffic from client 2"
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 2
                 permission: 2
                 source_ip_id: 8 # client 2
@@ -500,8 +498,9 @@ agents:
                 dest_port_id: 1
                 protocol_id: 1
           48: # old action num: 24 # block tcp traffic from client 1 to web app
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 3
                 permission: 2
                 source_ip_id: 7 # client 1
@@ -510,8 +509,9 @@ agents:
                 dest_port_id: 1
                 protocol_id: 3
           49: # old action num: 25 # block tcp traffic from client 2 to web app
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 4
                 permission: 2
                 source_ip_id: 8 # client 2
@@ -520,8 +520,9 @@ agents:
                 dest_port_id: 1
                 protocol_id: 3
           50: # old action num: 26
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 5
                 permission: 2
                 source_ip_id: 7 # client 1
@@ -530,8 +531,9 @@ agents:
                 dest_port_id: 1
                 protocol_id: 3
           51: # old action num: 27
-            action: "NETWORK_ACL_ADDRULE"
+            action: "ROUTER_ACL_ADDRULE"
             options:
+                target_router_hostname: router_1
                 position: 6
                 permission: 2
                 source_ip_id: 8 # client 2
@@ -540,44 +542,54 @@ agents:
                 dest_port_id: 1
                 protocol_id: 3
           52: # old action num: 28
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 0
           53: # old action num: 29
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 1
           54: # old action num: 30
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 2
           55: # old action num: 31
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 3
           56: # old action num: 32
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 4
           57: # old action num: 33
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 5
           58: # old action num: 34
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 6
           59: # old action num: 35
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 7
           60: # old action num: 36
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 8
           61: # old action num: 37
-            action: "NETWORK_ACL_REMOVERULE"
+            action: "ROUTER_ACL_REMOVERULE"
             options:
+                target_router_hostname: router_1
                 position: 9
           62: # old action num: 38
             action: "NETWORK_NIC_DISABLE"