diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
index bc70f1c..ef070a7 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_parsed_config.cfg
@@ -1,7 +1,9 @@
-set interfaces ethernet eth0 address 'dhcp'
-set interfaces ethernet eth1 address '192.0.2.14/24'
-set interfaces ethernet eth2 address '192.0.2.10/24'
-set interfaces ethernet eth2 address '192.0.2.11/24'
-set interfaces ethernet eth2 address '2001:db8::10/32'
-set interfaces ethernet eth2 address '2001:db8::12/32'
+set interfaces ethernet eth1 address '192.0.2.10/24'
+set interfaces ethernet eth1 address '2001:db8::10/32'
+set interfaces ethernet eth1 hw-id '08:00:27:da:67:43'
+set interfaces ethernet eth2 address '198.51.100.10/24'
+set interfaces ethernet eth2 hw-id '08:00:27:d8:70:b0'
+set interfaces ethernet eth2 vif 101 address '198.51.100.130/25'
+set interfaces ethernet eth2 vif 101 address '2001:db8::20/32'
+
 
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/parsed.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/parsed.yaml
index 2e0ce13..d5ff205 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/parsed.yaml
@@ -1,41 +1,16 @@
 ---
 - debug:
-    msg: START vyos_l3_interfaces parsed integration tests on connection={{ ansible_connection
+    msg: START vyos_l3_nterfaces parsed integration tests on connection={{ ansible_connection
       }}
 
-- include_tasks: _remove_config.yaml
-
-- include_tasks: _populate.yaml
-
-- block:
-
-    - name: Gather l3_interfaces facts
-      register: l3_interfaces_facts
-      vyos.vyos.vyos_facts:
-        gather_subset:
-          - default
-        gather_network_resources:
-          - l3_interfaces
-
-    - name: Provide the running configuration for parsing (config to be parsed)
-      register: result
-      vyos.vyos.vyos_l3_interfaces: &id001
-        running_config: "{{ lookup('file', '_parsed_config.cfg') }}"
-        state: parsed
-
-    - name: Assert that correct parsing done
-      assert:
-        that: "{{ ansible_facts['network_resources']['l3_interfaces'] | symmetric_difference(result['parsed'])\
-          \ |length == 0 }}"
-
-    - name: Gather the existing running configuration (IDEMPOTENT)
-      register: result
-      vyos.vyos.vyos_l3_interfaces: *id001
-
-    - name: Assert that the previous task was idempotent
-      assert:
-        that:
-          - result['changed'] == false
-  always:
-
-    - include_tasks: _remove_config.yaml
+- name: Parse externally provided interfaces config to agnostic model
+  register: result
+  vyos.vyos.vyos_l3_interfaces:
+    running_config: "{{ lookup('file', '_parsed_config.cfg') }}"
+    state: parsed
+
+- name: Assert that config was correctly parsed
+  assert:
+    that:
+      - "{{ parsed['after'] | symmetric_difference(result['parsed']) |length ==\
+        \ 0 }}"
diff --git a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
index 54be4c0..e9781e6 100644
--- a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
@@ -1,102 +1,118 @@
 ---
 merged:
   before:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
     - name: eth2
   commands:
     - set interfaces ethernet eth1 address '192.0.2.10/24'
     - set interfaces ethernet eth1 address '2001:db8::10/32'
     - set interfaces ethernet eth2 address '198.51.100.10/24'
     - set interfaces ethernet eth2 vif 101 address '198.51.100.130/25'
     - set interfaces ethernet eth2 vif 101 address '2001:db8::20/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
       ipv4:
         - address: 192.0.2.10/24
       ipv6:
         - address: 2001:db8::10/32
     - name: eth2
       ipv4:
         - address: 198.51.100.10/24
       vifs:
         - vlan_id: 101
           ipv4:
             - address: 198.51.100.130/25
           ipv6:
             - address: 2001:db8::20/32
 populate:
   - name: eth1
     ipv4:
       - address: 192.0.2.14/24
   - name: eth2
     ipv4:
       - address: 192.0.2.10/24
       - address: 192.0.2.11/24
     ipv6:
       - address: 2001:db8::10/32
       - address: 2001:db8::12/32
   - name: eth0
     ipv4:
       - address: dhcp
 replaced:
   commands:
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
     - set interfaces ethernet eth2 address '2001:db8::11/32'
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth1 address '192.0.2.19/24'
   after:
     - name: eth2
       ipv6:
         - address: 2001:db8::11/32
     - name: eth1
       ipv4:
         - address: 192.0.2.19/24
     - name: eth0
       ipv4:
         - address: dhcp
 overridden:
   commands:
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth1 address '192.0.2.15/24'
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
       ipv4:
         - address: 192.0.2.15/24
     - name: eth2
+parsed:
+  after:
+    - name: eth1
+      ipv4:
+        - address: 192.0.2.10/24
+      ipv6:
+        - address: 2001:db8::10/32
+    - name: eth2
+      ipv4:
+        - address: 198.51.100.10/24
+      vifs:
+        - vlan_id: 101
+          ipv4:
+            - address: 198.51.100.130/25
+          ipv6:
+            - address: 2001:db8::20/32
 rendered:
   commands:
     - set interfaces ethernet eth1 address '192.0.2.14/24'
     - set interfaces ethernet eth2 address '192.0.2.11/24'
     - set interfaces ethernet eth2 address '192.0.2.10/24'
     - set interfaces ethernet eth2 address '2001:db8::10/32'
     - set interfaces ethernet eth2 address '2001:db8::12/32'
 
 deleted:
   commands:
     - delete interfaces ethernet eth1 address '192.0.2.14/24'
     - delete interfaces ethernet eth2 address '192.0.2.10/24'
     - delete interfaces ethernet eth2 address '192.0.2.11/24'
     - delete interfaces ethernet eth2 address '2001:db8::10/32'
     - delete interfaces ethernet eth2 address '2001:db8::12/32'
   after:
     - name: eth0
       ipv4:
         - address: dhcp
     - name: eth1
     - name: eth2