Always clear config before setting base config in tests. (#306)

* Always clear config before setting base config in tests.

* Clear bond before removing

86 files changed, 71 insertions, 160 deletions

diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/_populate.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/_populate.yaml
index 3aca9161..ecbcc70d 100644
--- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/_populate.yaml
@@ -1,5 +1,7 @@
 ---
-- name: setup
+- ansible.builtin.include_tasks: _remove_config.yaml
+
+- name: Setup
   vyos.vyos.vyos_config:
     lines:
       - set policy access-list 20 description 'acl20'
diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml
index 64f6f34b..5d60f362 100644
--- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/deleted.yaml
@@ -4,8 +4,6 @@
       START vyos_bgp_address_family deleted integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml
index f05094f7..a8f428fa 100644
--- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_bgp_address_family gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml
index fdbc00b4..94144940 100644
--- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/overridden.yaml
@@ -4,8 +4,6 @@
       START vyos_bgp_address_family overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml b/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml
index d7825822..0a2ccd9b 100644
--- a/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_bgp_address_family/tests/cli/replaced.yaml
@@ -4,8 +4,6 @@
       START vyos_bgp_address_family replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/_populate.yaml
index ec237d9a..0f281c94 100644
--- a/tests/integration/targets/vyos_bgp_global/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_bgp_global/tests/cli/_populate.yaml
@@ -1,5 +1,7 @@
 ---
-- name: setup
+- ansible.builtin.include_tasks: _remove_config.yaml
+
+- name: Setup
   vyos.vyos.vyos_config:
     lines:
       - set policy access-list 20 description 'acl20'
diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml
index 8df16771..00a799e1 100644
--- a/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_bgp_global/tests/cli/deleted.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_bgp_global deleted integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml
index 742951ff..e5eca7a0 100644
--- a/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_bgp_global/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_bgp_global gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml
index 0af8775d..239f7481 100644
--- a/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml
+++ b/tests/integration/targets/vyos_bgp_global/tests/cli/purged.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_bgp_global purged integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml
index aeb4aa7b..99ea04d4 100644
--- a/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_bgp_global/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_bgp_global replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/_populate.yaml
index 27d1aa2d..d79f4773 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml
index 31620f40..df9be56d 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/deleted.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_firewall_global deleted integration tests ansible_connection={{
+      START vyos_firewall_global deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/gathered.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/gathered.yaml
index a3338038..e2b60fce 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_firewall_global gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/parsed.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/parsed.yaml
index 82b7330d..54885ceb 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/parsed.yaml
@@ -4,8 +4,6 @@
       START vyos_firewall_global parsed integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/rendered.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/rendered.yaml
index 16d585e8..951abe15 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/rendered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_firewall_global rendered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml
index e213bdf3..6b0ee82a 100644
--- a/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_firewall_global/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_firewall_global replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_populate.yaml
index 8b3dacd8..3dee476e 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted.yaml
index f1a0a4d3..eb9bded5 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_firewall_interfaces deleted integration tests ansible_connection={{
+      START vyos_firewall_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate_rule_sets.yaml
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_afi.yaml b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_afi.yaml
index b33aea89..8a31b2ac 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_afi.yaml
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_afi.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_firewall_interfaces deleted integration tests ansible_connection={{
+      START vyos_firewall_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate_rule_sets.yaml
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_all.yaml b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_all.yaml
index 1293f6a2..a3515b0f 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_all.yaml
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_all.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_firewall_interfaces deleted integration tests ansible_connection={{
+      START vyos_firewall_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate_rule_sets.yaml
diff --git a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_single.yaml b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_single.yaml
index eb42c02c..d62e27fd 100644
--- a/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_single.yaml
+++ b/tests/integration/targets/vyos_firewall_interfaces/tests/cli/deleted_single.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_firewall_interfaces deleted integration tests ansible_connection={{
+      START vyos_firewall_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate_rule_sets.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
index 702930c5..ee0b775d 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
index 85bf4d36..f8057c8d 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_interfaces gathered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
index d4052c8a..66588cdd 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
@@ -4,8 +4,6 @@
       START vyos_interfaces overridden integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
index e8f3591a..41d10d00 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
@@ -4,8 +4,6 @@
       START vyos_interfaces rendered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
index daf8045f..a22a4c78 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
@@ -4,8 +4,6 @@
       START vyos_interfaces replaced integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
index d5d86209..2a766d5d 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
index 25ce28e0..9242fb51 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
@@ -1,14 +1,12 @@
 ---
 - debug:
     msg:
-      Start vyos_interfaces deleted integration tests ansible_connection={{ ansible_connection
+      START vyos_interfaces deleted integration tests ansible_connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
+- include_tasks: _populate.yaml
 
 - block:
-    - include_tasks: _populate.yaml
-
     - name: Delete attributes of given interfaces
       register: result
       vyos.vyos.vyos_l3_interfaces: &id001
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/gathered.yaml
index ce8faba5..f18f7d37 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_l3_interfaces gathered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
index dc6f0cec..c12e2ae6 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
@@ -4,11 +4,9 @@
       START vyos_l3_interfaces merged integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
+- include_tasks: _populate.yaml
 
 - block:
-    - include_tasks: _populate.yaml
-
     - name: Overrides all device configuration with provided configuration
       register: result
       vyos.vyos.vyos_l3_interfaces: &id001
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/rendered.yaml
index 7bbf53ca..2a606c30 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/rendered.yaml
@@ -4,8 +4,6 @@
       START vyos_l3_interfaces rendered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
index c102602d..26fe4f8e 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
@@ -4,11 +4,9 @@
       START vyos_l3_interfaces replaced integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
+- include_tasks: _populate.yaml
 
 - block:
-    - include_tasks: _populate.yaml
-
     - name: Replace device configurations of listed interfaces with provided configurations
       register: result
       vyos.vyos.vyos_l3_interfaces: &id001
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/redirection/cli/shortname.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/redirection/cli/shortname.yaml
index bee2a098..963ab55a 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/redirection/cli/shortname.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/redirection/cli/shortname.yaml
@@ -2,8 +2,6 @@
 - debug:
     msg: START l3_interfaces rendered on connection={{ ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
index 00b7e6e3..fa191ed3 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_add_bond.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_bond.yaml
+
 - name: Add Bond
   vars:
     lines: "set interfaces bonding bond0\nset interfaces bonding bond1\n"
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
index 4ad0b856..d519d28f 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _add_bond.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
index dfc99201..017c56a1 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_bond.yaml
@@ -1,4 +1,15 @@
 ---
+- name: Remove Config
+  vars:
+    lines:
+      "delete interfaces bonding bond0 hash-policy\ndelete interfaces ethernet\
+      \ eth1 bond-group bond0\ndelete interfaces bonding bond0 mode\ndelete interfaces\
+      \ bonding bond0 primary\ndelete interfaces bonding bond1 hash-policy\ndelete\
+      \ interfaces ethernet eth2 bond-group bond1\ndelete interfaces bonding bond1\
+      \ mode\ndelete interfaces bonding bond1 primary\n"
+  ansible.netcommon.cli_config:
+    config: "{{ lines }}"
+
 - name: Remove Bond
   vars:
     lines: "delete interfaces bonding bond0\ndelete interfaces bonding bond1\n"
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
deleted file mode 100644
index 11432ea9..00000000
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/_remove_config.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-- name: Remove Config
-  vars:
-    lines:
-      "delete interfaces bonding bond0 hash-policy\ndelete interfaces ethernet\
-      \ eth1 bond-group bond0\ndelete interfaces bonding bond0 mode\ndelete interfaces\
-      \ bonding bond0 primary\ndelete interfaces bonding bond1 hash-policy\ndelete\
-      \ interfaces ethernet eth2 bond-group bond1\ndelete interfaces bonding bond1\
-      \ mode\ndelete interfaces bonding bond1 primary\n"
-  ansible.netcommon.cli_config:
-    config: "{{ lines }}"
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
index 56f1ed6c..ae15884f 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_lag_interfaces deleted integration tests ansible_connection={{
+      START vyos_lag_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
@@ -48,4 +48,4 @@
           - "{{ deleted['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/gathered.yaml
index 3e6d8e14..caa8f305 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_lag_interfaces gathered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
@@ -22,4 +20,4 @@
             \ }}"
 
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
index 4af04ff2..8e6c7646 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
@@ -4,10 +4,6 @@
       START vyos_lag_interfaces merged integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
-- include_tasks: _remove_bond.yaml
-
 - include_tasks: _add_bond.yaml
 
 - block:
@@ -65,4 +61,4 @@
           - "{{ merged['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
index 9682fd79..93aa7d9c 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
@@ -3,10 +3,6 @@
     msg: START vyos_lag_interfaces overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
-- include_tasks: _remove_bond.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
@@ -54,4 +50,4 @@
           - "{{ overridden['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/parsed.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/parsed.yaml
index ce2df0d2..412dcaf8 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/parsed.yaml
@@ -4,8 +4,6 @@
       START vyos_lag_interfaces parsed integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
@@ -30,4 +28,4 @@
           \ |length == 0 }}"
 
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rendered.yaml
index 781100fb..ad051995 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rendered.yaml
@@ -4,8 +4,6 @@
       START vyos_lag_interfaces rendered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
@@ -34,4 +32,4 @@
             \ |length == 0 }}"
 
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
index c8b711b3..2e6de6c7 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
@@ -4,8 +4,6 @@
       START vyos_lag_interfaces replaced integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
@@ -54,4 +52,4 @@
           - "{{ replaced['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
index f5f6098a..0e7c1787 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_lag_interfaces round trip integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _remove_bond.yaml
 
 - block:
@@ -69,4 +67,4 @@
           "{{ base_config['after'] | symmetric_difference(revert['after']) |length\
           \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/redirection/cli/shortname.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/redirection/cli/shortname.yaml
index 005aa855..876563c9 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/redirection/cli/shortname.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/redirection/cli/shortname.yaml
@@ -2,10 +2,6 @@
 - debug:
     msg: START lag_interfaces merged on connection={{ ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
-- include_tasks: _remove_bond.yaml
-
 - include_tasks: _add_bond.yaml
 
 - block:
@@ -63,4 +59,4 @@
           - "{{ merged['after'] | symmetric_difference(result['before']) |length\
             \ == 0 }}"
   always:
-    - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_bond.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
index 24c114d7..eb0f21ed 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
index c086e2bd..0d36e5f6 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: Start vyos_lldp_global deleted integration tests ansible_connection={{
+    msg: START vyos_lldp_global deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/gathered.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/gathered.yaml
index 7e09b6b6..46e5b363 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_lldp_global gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
index dc7b7b16..85a35f6f 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
@@ -4,8 +4,6 @@
       START vyos_lldp_global merged integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
index 6859dc8e..55874b79 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
@@ -4,8 +4,6 @@
       START vyos_lldp_global replaced integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
index 406d30bd..2c6782bd 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines:
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
index c5b30afa..776fa22d 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
@@ -1,7 +1,7 @@
 ---
 - debug:
     msg:
-      Start vyos_lldp_interfaces deleted integration tests ansible_connection={{
+      START vyos_lldp_interfaces deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
index 8a59955e..216f2d12 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_lldp_interfaces gathered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
index e76e3b25..46c91cf3 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_lldp_interfaces replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml
index 2f3828f6..516df94a 100644
--- a/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: POPULATE Apply the provided configuration
   register: result
   vyos.vyos.vyos_logging_global:
diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/deleted.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/deleted.yaml
index 2a0a3552..cd89ac5d 100644
--- a/tests/integration/targets/vyos_logging_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/cli/deleted.yaml
@@ -1,9 +1,8 @@
 ---
 - debug:
-    msg: Start Deleted integration state for vyos_logging ansible_connection={{
+    msg: START Deleted integration state for vyos_logging ansible_connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/gathered.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/gathered.yaml
index af1fa521..a4b26d49 100644
--- a/tests/integration/targets/vyos_logging_global/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_logging_global gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/overridden.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/overridden.yaml
index e5eea383..c532b5aa 100644
--- a/tests/integration/targets/vyos_logging_global/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/cli/overridden.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_logging_global overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_logging_global/tests/cli/rendered.yaml b/tests/integration/targets/vyos_logging_global/tests/cli/rendered.yaml
index 01caca5a..7858b9ff 100644
--- a/tests/integration/targets/vyos_logging_global/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_logging_global/tests/cli/rendered.yaml
@@ -4,8 +4,6 @@
       START vyos_logging_global rendered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_populate.yaml
index c4749d3b..e30e9fb9 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/_populate.yaml
@@ -1,5 +1,7 @@
 ---
-- name: setup
+- ansible.builtin.include_tasks: _remove_config.yaml
+
+- name: Setup
   vyos.vyos.vyos_config:
     lines:
       - set interfaces ethernet eth0 ip ospf cost 50
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml
index 4efca68f..679a39be 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/deleted.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospf_interfaces deleted integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml
index 21b6e5ad..84c22cb9 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospf_interfaces gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml
index dae9a6e0..2652c40a 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/overridden.yaml
@@ -4,8 +4,6 @@
       START vyos_ospf_interfaces overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml
index 89c8c767..9efcdea6 100644
--- a/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_ospf_interfaces/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospf_interfaces replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv2/tests/cli/_populate.yaml b/tests/integration/targets/vyos_ospfv2/tests/cli/_populate.yaml
index a4453752..f17c5cb5 100644
--- a/tests/integration/targets/vyos_ospfv2/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines: "set protocols ospf mpls-te 'enable' \n
diff --git a/tests/integration/targets/vyos_ospfv2/tests/cli/deleted.yaml b/tests/integration/targets/vyos_ospfv2/tests/cli/deleted.yaml
index 9fc0d706..553bb9f6 100644
--- a/tests/integration/targets/vyos_ospfv2/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tests/cli/deleted.yaml
@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: Start vyos_ospfv2 deleted integration tests ansible_connection={{
+    msg: START vyos_ospfv2 deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
diff --git a/tests/integration/targets/vyos_ospfv2/tests/cli/gathered.yaml b/tests/integration/targets/vyos_ospfv2/tests/cli/gathered.yaml
index fed8c98c..a8e3149d 100644
--- a/tests/integration/targets/vyos_ospfv2/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospfv2 gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv2/tests/cli/merged_update.yaml b/tests/integration/targets/vyos_ospfv2/tests/cli/merged_update.yaml
index 30df9a4c..bc821468 100644
--- a/tests/integration/targets/vyos_ospfv2/tests/cli/merged_update.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tests/cli/merged_update.yaml
@@ -4,8 +4,6 @@
       START vyos_ospfv2 merged integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv2/tests/cli/replaced.yaml b/tests/integration/targets/vyos_ospfv2/tests/cli/replaced.yaml
index e1fc3898..b348484f 100644
--- a/tests/integration/targets/vyos_ospfv2/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_ospfv2/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospfv2 replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
index 31f90ef9..164fcc06 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines: "set protocols ospfv3 area 2 export-list 'export1' \n
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/deleted.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/deleted.yaml
index e0be4c3a..2e55472f 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/deleted.yaml
@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: Start vyos_ospfv3 deleted integration tests ansible_connection={{
+    msg: START vyos_ospfv3 deleted integration tests ansible_connection={{
       ansible_connection }}
 
 - include_tasks: _populate.yaml
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/gathered.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/gathered.yaml
index 1be8f8da..3654bbee 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospfv3 gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/merged_update.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/merged_update.yaml
index c6f0e8b4..02657c8e 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/merged_update.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/merged_update.yaml
@@ -4,8 +4,6 @@
       START vyos_ospfv3 merged integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_ospfv3/tests/cli/replaced.yaml b/tests/integration/targets/vyos_ospfv3/tests/cli/replaced.yaml
index 08291ba2..e5905f51 100644
--- a/tests/integration/targets/vyos_ospfv3/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_ospfv3/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_ospfv3 replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml
index 9ef975f0..98e01615 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/_populate.yaml
@@ -1,5 +1,7 @@
 ---
-- name: setup
+- ansible.builtin.include_tasks: _remove_config.yaml
+
+- name: Setup
   vyos.vyos.vyos_config:
     lines:
       - set policy route-map test2 rule 1 action 'permit'
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/deleted.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/deleted.yaml
index fe68d565..84b64466 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/deleted.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_route_maps deleted integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml
index 430b9d5e..358f5b16 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/gathered.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_route_maps gathered integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml
index 168ef17b..d33a7c41 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/overridden.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_route_maps overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml b/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml
index fa0380bc..57a91fd0 100644
--- a/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_route_maps/tests/cli/replaced.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_route_maps replaced integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml
index 4c54ef64..12e43921 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/_populate.yaml
@@ -1,4 +1,6 @@
 ---
+- ansible.builtin.include_tasks: _remove_config.yaml
+
 - name: Setup
   vars:
     lines: "set protocols static route 192.0.2.32/28 next-hop '192.0.2.10'\nset\
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/gathered.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/gathered.yaml
index 8435d049..6b34912b 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/gathered.yaml
@@ -4,8 +4,6 @@
       START vyos_static_routes gathered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/overridden.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/overridden.yaml
index d1bedc83..9281306f 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/overridden.yaml
@@ -3,8 +3,6 @@
     msg: START vyos_static_routes overridden integration tests on connection={{
       ansible_connection }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/parsed.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/parsed.yaml
index 06cad977..5776f7f0 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/parsed.yaml
@@ -4,8 +4,6 @@
       START vyos_static_routes parsed integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/rendered.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/rendered.yaml
index 81e72599..4362d1fd 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/rendered.yaml
@@ -4,8 +4,6 @@
       START vyos_static_routes rendered integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block:
diff --git a/tests/integration/targets/vyos_static_routes/tests/cli/replaced.yaml b/tests/integration/targets/vyos_static_routes/tests/cli/replaced.yaml
index 50af5edb..28f80fb1 100644
--- a/tests/integration/targets/vyos_static_routes/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_static_routes/tests/cli/replaced.yaml
@@ -4,8 +4,6 @@
       START vyos_static_routes replaced integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
 - include_tasks: _populate.yaml
 
 - block: