diff --git a/README.md b/README.md
index 5d8e1e8b..6650cb67 100644
--- a/README.md
+++ b/README.md
@@ -1,261 +1,264 @@
 
 # VyOS Collection
 
 [![codecov](https://codecov.io/gh/vyos/vyos.vyos/graph/badge.svg?token=J217GFD69W)](https://codecov.io/gh/vyos/vyos.vyos)
 [![CI](https://github.com/vyos/vyos.vyos/actions/workflows/tests.yml/badge.svg?branch=main&event=schedule)](https://github.com/vyos/vyos.vyos/actions/workflows/tests.yml)
 
 The Ansible VyOS collection includes a variety of Ansible content to help automate the management of VyOS network appliances.
 
 This collection has been tested against VyOS 1.3.8, 1.4.1 and the current rolling release for 1.5. Where possible,
 compatibility with older versions of VyOS are maintained but not guaranteed.
 
 ## Communication
 
 * Join the VyOS forum:
   * [FAQ](https://forum.vyos.io/faq): find answers to frequently asked questions.
   * [Guides and How To](https://forum.vyos.io/c/howto-guies/27): find guides and how-to articles.
   * [News & Announcements](https://forum.vyos.io/c/announcements/6): track project-wide announcements .
 
 
 <!--start requires_ansible-->
 ## Ansible version compatibility
 
 This collection has been tested against following Ansible versions: **>=2.15.0**.
 
 For collections that support Ansible 2.9, please ensure you update your `network_os` to use the
 fully qualified collection name (for example, `cisco.ios.ios`).
 Plugins and modules within a collection may be tested with only specific Ansible versions.
 A collection may contain metadata that identifies these versions.
 PEP440 is the schema used to describe the versions of Ansible.
 <!--end requires_ansible-->
 
 
 ### Supported connections
 The VyOS collection supports ``network_cli`` connections.
 
 ## Included content
 
 <!--start collection content-->
 ### Cliconf plugins
 Name | Description
 --- | ---
 [vyos.vyos.vyos](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_cliconf.rst)|Use vyos cliconf to run command on VyOS platform
 
 ### Modules
 Name | Description
 --- | ---
 [vyos.vyos.vyos_banner](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_banner_module.rst)|Manage multiline banners on VyOS devices
 [vyos.vyos.vyos_bgp_address_family](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_bgp_address_family_module.rst)|BGP Address Family resource module
 [vyos.vyos.vyos_bgp_global](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_bgp_global_module.rst)|BGP global resource module
 [vyos.vyos.vyos_command](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_command_module.rst)|Run one or more commands on VyOS devices
 [vyos.vyos.vyos_config](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_config_module.rst)|Manage VyOS configuration on remote device
 [vyos.vyos.vyos_facts](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_facts_module.rst)|Get facts about vyos devices.
 [vyos.vyos.vyos_firewall_global](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_firewall_global_module.rst)|Firewall global resource module
 [vyos.vyos.vyos_firewall_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_firewall_interfaces_module.rst)|Firewall interfaces resource module
 [vyos.vyos.vyos_firewall_rules](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_firewall_rules_module.rst)|Firewall rules resource module
 [vyos.vyos.vyos_hostname](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_hostname_module.rst)|Manages hostname resource module
 [vyos.vyos.vyos_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_interfaces_module.rst)|Manages interface attributes of VyOS network devices.
 [vyos.vyos.vyos_l3_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_l3_interfaces_module.rst)|Layer 3 interfaces resource module.
 [vyos.vyos.vyos_lag_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_lag_interfaces_module.rst)|LAG interfaces resource module
 [vyos.vyos.vyos_lldp_global](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_lldp_global_module.rst)|LLDP global resource module
 [vyos.vyos.vyos_lldp_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_lldp_interfaces_module.rst)|LLDP interfaces resource module
 [vyos.vyos.vyos_logging_global](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_logging_global_module.rst)|Logging resource module
 [vyos.vyos.vyos_ntp_global](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_ntp_global_module.rst)|NTP global resource module
 [vyos.vyos.vyos_ospf_interfaces](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_ospf_interfaces_module.rst)|OSPF Interfaces Resource Module.
 [vyos.vyos.vyos_ospfv2](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_ospfv2_module.rst)|OSPFv2 resource module
 [vyos.vyos.vyos_ospfv3](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_ospfv3_module.rst)|OSPFv3 resource module
 [vyos.vyos.vyos_ping](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_ping_module.rst)|Tests reachability using ping from VyOS network devices
 [vyos.vyos.vyos_prefix_lists](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_prefix_lists_module.rst)|Prefix-Lists resource module for VyOS
 [vyos.vyos.vyos_route_maps](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_route_maps_module.rst)|Route Map resource module
 [vyos.vyos.vyos_snmp_server](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_snmp_server_module.rst)|Manages snmp_server resource module
 [vyos.vyos.vyos_static_routes](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_static_routes_module.rst)|Static routes resource module
 [vyos.vyos.vyos_system](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_system_module.rst)|Run `set system` commands on VyOS devices
 [vyos.vyos.vyos_user](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_user_module.rst)|Manage the collection of local users on VyOS device
 [vyos.vyos.vyos_vlan](https://github.com/vyos/vyos.vyos/blob/main/docs/vyos.vyos.vyos_vlan_module.rst)|Manage VLANs on VyOS network devices
 
 <!--end collection content-->
 
 Click the ``Content`` button to see the list of content included in this collection.
 
 ## Installing this collection
 
 You can install the VyOS collection with the Ansible Galaxy CLI:
 
     ansible-galaxy collection install vyos.vyos
 
 You can also include it in a `requirements.yml` file and install it with `ansible-galaxy collection install -r requirements.yml`, using the format:
 
 ```yaml
 ---
 collections:
   - name: vyos.vyos
 ```
 ## Using this collection
 
 
 This collection includes [network resource modules](https://docs.ansible.com/ansible/latest/network/user_guide/network_resource_modules.html).
 
 ### Using modules from the VyOS collection in your playbooks
 
 You can call modules by their Fully Qualified Collection Namespace (FQCN), such as `vyos.vyos.vyos_static_routes`.
 The following example task replaces configuration changes in the existing configuration on a VyOS network device, using the FQCN:
 
 ```yaml
 ---
   - name: Replace device configurations of listed static routes with provided
       configurations
     register: result
     vyos.vyos.vyos_static_routes: &id001
       config:
 
         - address_families:
 
             - afi: ipv4
               routes:
 
                 - dest: 192.0.2.32/28
                   blackhole_config:
                     distance: 2
                   next_hops:
 
                     - forward_router_address: 192.0.2.7
 
                     - forward_router_address: 192.0.2.8
 
                     - forward_router_address: 192.0.2.9
       state: replaced
 ```
 
 **NOTE**: For Ansible 2.9, you may not see deprecation warnings when you run your playbooks with this collection. Use this documentation to track when a module is deprecated.
 
 
 
 ### See Also:
 
 * [VyOS Platform Options](https://docs.ansible.com/ansible/latest/network/user_guide/platform_vyos.html)
 * [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
 
 ## Contributing to this collection
 
 We welcome community contributions to this collection. If you find problems, please open an issue or create a PR against the [VyOS collection repository](https://github.com/vyos/vyos.vyos). See [Contributing to VyOS](https://vyos.net/contribute/) for complete details.
 
 You can also join us on:
 
 - Forum - https://forum.vyos.io
 
 See the [Contributing to VyOS](https://vyos.net/contribute/) for details on contributing to Ansible.
 
 ### Code of Conduct
 This collection follows the Ansible project's
 [Code of Conduct](https://docs.ansible.com/ansible/devel/community/code_of_conduct.html).
 Please read and familiarize yourself with this document.
 
 ### Updating from resource module models
 
 Some of our modules were templated using `resource_module_builder`, but some use
 the newer [`cli_rm_builder`](https://github.com/ansible-network/cli_rm_builder)
 which tempaltes baed on in-place device information, but also uses a new network
 parsing engine designed to simplify and standardize the parsing of network
 configuration.
 
 #### Using older *resource_module_builder* modules
 
 Last build was with a slightly-modified version of resource_module_builder.
 This changes the calling parameters for the resources.
 
 To update the collection from the resource module models, run the following command:
 
 ```bash
 ansible-playbook -e rm_dest=`pwd` \
                  -e structure=collection \
                  -e collection_org=vyos \
                  -e collection_name=vyos \
                  -e model=../../../resource_module_models/models/vyos/firewall_rules/vyos_firewall_rules.yaml \
                  ../../../resource_module_builder/site.yml
 ```
 
 #### Using *cli_rm_builder* modules
 
 The newer `cli_rm_builder` works similarly to the older `resource_module_builder`, but
 pulls the information directly from the `DOCUMENTATION`, `EXAMPLES` and `RETURN`
 blocks in the module itself.
 
 To update the collection from the `cli_rm_builder` models, run the following command:
 
 ```bash
 ansible-playbook -e rm_dest=`pwd` \
                      -e collection_org=vyos \
                      -e collection_name=vyos \
                      -e resource=bgp_address_family \
                      ../../../cli_rm_builder/run.yml
 ```
 
 Unlike the `resource_module_builder`, the `cli_rm_builder` does not require the `model` parameter. Instead, it uses the `resource` parameter to specify the resource to build.
 
 ### Testing playbooks
 
 You can use `ANSIBLE_COLLECTIONS_PATH` to test the collection locally. For example:
 ```
 ANSIBLE_COLLECTIONS_PATHS=~/my_dev_path ansible-playbook -i inventory.network test.yml
 ```
 
 ### Integration Tests
 
 Integration tests are run using `ansible-test` and require that there be an inventory
 defined (you can pass this in with `--inventory <filename>`) and that the system be
 configured for access (recommended to use SSH keys).
 
 Additionally:
 - eth0 should be configured for `address dhcp` and should have an assigned address
   on the local network
 - eth1 and eth2 should be defined and uncofirgured (they'll be overwritten by the tests)
 - eth3 and beyond should not be present or interface-related tests will fail
+- when using VMs for testing, ensure that the interfaces don't use `virtio`, as it will supress
+  some interface configurations. `e1000e` is a good choice for testing.
 - eth0 is also expected to show `duplex auto` and `speed auto` in the output of `show interfaces`,
   however others are not due to the fact that they are repeatedly deleted and recreated
   which causes the default values to be hidden.
 
 ## Changelogs
-<!--Add a link to a changelog.md file or an external docsite to cover this information. -->
+
+Change logs are available [here](https://github.com/vyos/vyos.vyos/blob/main/CHANGELOG.rst).
 
 ## Release notes
 
 Release notes are available [here](https://github.com/vyos/vyos.vyos/blob/main/CHANGELOG.rst).
 
 ## Roadmap
 
 <!-- Optional. Include the roadmap for this collection, and the proposed release/versioning strategy so users can anticipate the upgrade/update cycle. -->
 
 Major Version | Ansible Support | VyOS Support | Details
 --- | --- | --- | ---
 4.1.0 | 2.15 | 1.1.2 | Final release for the 4.x series
 5.0.0 | 2.16 | 1.1.2 | First relase under VyOS control as a separate collection
 6.0.0 | 2.18 | 1.3.8 | *Planned* release for supporting VyOS 1.3.8+
 7.0.0 | x.xx | 1.4.x | *Prospective* release deprecating incompatible 1.3.x modules
 
 Note:
 - Unreleased versions are not guaranteed to be released as described.
 - Some modules may support a wider variety of versions depending upon the compatibility
   with prior versions of VyOS.
 - The roadmap is subject to change based on community feedback and contributions.
 
 
 ## More information
 
 VyOS resources
 - [Contributing to VyOS](https://vyos.net/contribute)
 - [VyOS documentation](https://docs.vyos.io/en/latest/)
 - [VyOS forum](https://forum.vyos.io)
 
 
 Ansible Resources
 - [Ansible network resources](https://docs.ansible.com/ansible/latest/network/getting_started/network_resources.html)
 - [Ansible Collection overview](https://github.com/ansible-collections/overview)
 - [Ansible User guide](https://docs.ansible.com/ansible/latest/user_guide/index.html)
 - [Ansible Developer guide](https://docs.ansible.com/ansible/latest/dev_guide/index.html)
 - [Ansible Community code of conduct](https://docs.ansible.com/ansible/latest/community/code_of_conduct.html)
 
 ## Licensing
 
 GNU General Public License v3.0 or later.
 
 See [LICENSE](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
diff --git a/changelogs/fragments/T7162-interface-preflight.yaml b/changelogs/fragments/T7162-interface-preflight.yaml
new file mode 100644
index 00000000..29ecf3d4
--- /dev/null
+++ b/changelogs/fragments/T7162-interface-preflight.yaml
@@ -0,0 +1,5 @@
+---
+trivial:
+  - fix pre-flight sets for interfaces
+  - restore previously-removed interface test duplex and speed
+  - remove unnecessary debug statemetns in integration tests
diff --git a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
index 5800a582..651f0d8b 100644
--- a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
+++ b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
@@ -1,14 +1,14 @@
 ---
 - name: Ensure required interfaces are present in running-config
   vars:
     lines: |-
       set interfaces ethernet eth0 address dhcp
       set interfaces ethernet eth0 speed auto
       set interfaces ethernet eth0 duplex auto
       set interfaces ethernet eth1 address 192.0.2.1/24
       set interfaces ethernet eth2
       delete interfaces loopback lo
-  ignore_errors: "{{ result.failed }}"
+  ignore_errors: True
   register: result
   ansible.netcommon.cli_config:
     config: "{{ lines }}"
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
index 45bd9b6a..cbc994ba 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
@@ -1,15 +1,17 @@
 ---
 - name: ensure facts
   include_tasks: _get_version.yaml
 
 - ansible.builtin.include_tasks: _remove_config.yaml
 
 - name: Setup
   ansible.netcommon.cli_config:
     config: |-
       {% for intf in ('eth1','eth2') %}
       set interfaces ethernet "{{ intf }}" description 'Configured by Ansible'
+      set interfaces ethernet "{{ intf }}" speed 'auto'
+      set interfaces ethernet "{{ intf }}" duplex 'auto'
       set interfaces ethernet "{{ intf }}" mtu '1500'
       set interfaces ethernet "{{ intf }}" vif 200
       set interfaces ethernet "{{ intf }}" vif 200 description 'VIF - 200'
       {% endfor %}
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
index 620bf53f..9f0734b4 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
@@ -1,46 +1,46 @@
 ---
 - debug:
     msg: Start vyos_interfaces deleted integration tests ansible_connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Delete attributes of given interfaces
       register: result
       vyos.vyos.vyos_interfaces: &id001
         config:
           - name: eth1
 
           - name: eth2
         state: deleted
 
     - name: Assert that the before dicts were correctly generated
       assert:
         that:
-          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - populate | symmetric_difference(result['before']) |length == 0
 
     - name: Assert that the correct set of commands were generated
       assert:
         that:
-          - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - deleted['commands'] | symmetric_difference(result['commands']) |length == 0
 
     - name: Assert that the after dicts were correctly generated
       assert:
         that:
-          - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - deleted['after'] | symmetric_difference(result['after']) |length == 0
 
     - name: Delete attributes of given interfaces (IDEMPOTENT)
       register: result
       vyos.vyos.vyos_interfaces: *id001
 
     - name: Assert that the previous task was idempotent
       assert:
         that:
           - result.changed == false
 
     - name: Assert that the before dicts were correctly generated
       assert:
         that:
-          - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - deleted['after'] | symmetric_difference(result['before']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
index 88e53762..46a0e166 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/gathered.yaml
@@ -1,20 +1,20 @@
 ---
 - debug:
     msg: START vyos_interfaces gathered integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Gather the provided configuration with the existing running configuration
       register: result
       vyos.vyos.vyos_interfaces:
         config:
         state: gathered
 
     - name: Assert that gathered dicts was correctly generated
       assert:
         that:
-          - "{{ populate | symmetric_difference(result['gathered']) |length == 0 }}"
+          - populate | symmetric_difference(result['gathered']) |length == 0
 
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
index 5c719b39..decdeca2 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
@@ -1,57 +1,59 @@
 ---
 - debug:
     msg: START vyos_interfaces merged integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _remove_config.yaml
 
 - block:
     - name: Merge the provided configuration with the existing running configuration
       register: result
       vyos.vyos.vyos_interfaces: &id001
         config:
           - name: eth1
             description: Configured by Ansible - Interface 1
             mtu: 1500
+            speed: auto
+            duplex: auto
             vifs:
               - vlan_id: 100
                 description: Eth1 - VIF 100
                 mtu: 1404
 
               - vlan_id: 101
                 description: Eth1 - VIF 101
 
           - name: eth2
             description: Configured by Ansible - Interface 2 (ADMIN DOWN)
             mtu: 1406
             enabled: false
         state: merged
 
     - name: Assert that before dicts were correctly generated
       assert:
-        that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
+        that: merged['before'] | symmetric_difference(result['before']) |length == 0
 
     - name: Assert that correct set of commands were generated
       assert:
         that:
-          - "{{ merged['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - merged['commands'] | symmetric_difference(result['commands']) |length == 0
 
     - name: Assert that after dicts was correctly generated
       assert:
         that:
-          - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - merged['after'] | symmetric_difference(result['after']) |length == 0
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
       register: result
       vyos.vyos.vyos_interfaces: *id001
 
     - name: Assert that the previous task was idempotent
       assert:
         that:
           - result['changed'] == false
 
     - name: Assert that before dicts were correctly generated
       assert:
         that:
-          - "{{ merged['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - merged['after'] | symmetric_difference(result['before']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
index 7e86d3e4..5d87ab68 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
@@ -1,50 +1,50 @@
 ---
 - debug:
     msg: START vyos_interfaces overridden integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Overrides all device configuration with provided configuration
       register: result
       vyos.vyos.vyos_interfaces: &id001
         config:
           - name: eth0
             speed: auto
             duplex: auto
 
           - name: eth2
             description: Overridden by Ansible
             mtu: 1402
         state: overridden
 
     - name: Assert that before dicts were correctly generated
       assert:
         that:
-          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - populate | symmetric_difference(result['before']) |length == 0
 
     - name: Assert that correct commands were generated
       assert:
         that:
-          - "{{ overridden['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - overridden['commands'] | symmetric_difference(result['commands']) |length == 0
 
     - name: Assert that after dicts were correctly generated
       assert:
         that:
-          - "{{ overridden['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - overridden['after'] | symmetric_difference(result['after']) |length == 0
 
     - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
       register: result
       vyos.vyos.vyos_interfaces: *id001
 
     - name: Assert that the previous task was idempotent
       assert:
         that:
           - result['changed'] == false
 
     - name: Assert that before dicts were correctly generated
       assert:
         that:
-          - "{{ overridden['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - overridden['after'] | symmetric_difference(result['before']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/parsed.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/parsed.yaml
index 0ebfd322..329d6b50 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/parsed.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/parsed.yaml
@@ -1,14 +1,14 @@
 ---
 - debug:
     msg: START vyos_interfaces parsed integration tests on connection={{ ansible_connection }}
 
 - name: Parse externally provided interfaces config to agnostic model
   register: result
   vyos.vyos.vyos_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 }}"
+      - parsed['after'] | symmetric_difference(result['parsed']) |length == 0
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
index c03347fa..7b66c50e 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/rendered.yaml
@@ -1,37 +1,41 @@
 ---
 - debug:
     msg: START vyos_interfaces rendered integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Structure provided configuration into device specific commands
       register: result
       vyos.vyos.vyos_interfaces:
         config:
           - name: eth0
             enabled: true
+            duplex: auto
+            speed: auto
           - name: eth1
             description: Configured by Ansible - Interface 1
             mtu: 1500
+            duplex: auto
+            speed: auto
             enabled: true
             vifs:
               - vlan_id: 100
                 description: Eth1 - VIF 100
                 mtu: 1404
                 enabled: true
               - vlan_id: 101
                 description: Eth1 - VIF 101
                 enabled: true
           - name: eth2
             description: Configured by Ansible - Interface 2 (ADMIN DOWN)
             mtu: 1406
             enabled: false
         state: rendered
 
     - name: Assert that correct set of commands were generated
       assert:
         that:
           - "{{ rendered['commands'] | symmetric_difference(result['rendered']) |length == 0 }}"
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
index 9d0a3a8b..5cfa4523 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
@@ -1,66 +1,60 @@
 ---
 - debug:
     msg: START vyos_interfaces replaced integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Replace device configurations of listed interfaces with provided configurations
       register: result
       vyos.vyos.vyos_interfaces: &id001
         config:
           - name: eth1
             description: Replaced by Ansible
             vifs:
               - vlan_id: 100
                 description: VIF 100 - Replaced by Ansible
 
           - name: eth2
             mtu: 1400
             description: Replaced by Ansible
         state: replaced
 
     - name: Assert that correct set of commands were generated
       assert:
         that:
           - replaced['commands'] | symmetric_difference(result['commands']) |length == 0
 
-    - debug:
-        var: populate | symmetric_difference(result['before'])
-
     - name: Assert that before dicts are correctly generated
       assert:
         that:
           - populate | symmetric_difference(result['before']) |length == 0
 
-    - debug:
-        var: replaced['after'] | symmetric_difference(result['after'])
-
     - name: Assert that after dict is correctly generated
       assert:
         that:
           - replaced['after'] | symmetric_difference(result['after']) |length == 0
 
     - vyos.vyos.vyos_facts:
         gather_network_resources: interfaces
 
     - name: Assert that the facts and the after dict are the same
       assert:
         that:
           - result.after == ansible_facts['network_resources']['interfaces']
 
     - name: Replace device configurations of listed interfaces with provided configurarions (IDEMPOTENT)
       register: result
       vyos.vyos.vyos_interfaces: *id001
 
     - name: Assert that task was idempotent
       assert:
         that:
           - result['changed'] == false
 
     - name: Assert that before dict is correctly generated
       assert:
         that:
           - replaced['after'] | symmetric_difference(result['before']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
index cfe1b0f0..e6753cba 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
@@ -1,77 +1,79 @@
 ---
 - debug:
     msg: START vyos_interfaces round trip integration tests on connection={{ ansible_connection }}
 
 - include_tasks: _remove_config.yaml
 
 - block:
     - name: Apply the provided configuration (base config)
       register: base_config
       vyos.vyos.vyos_interfaces:
         config:
           - name: eth0
             enabled: true
+            duplex: auto
+            speed: auto
 
           - name: eth1
             description: Interface - 1
             mtu: 1500
             vifs:
               - vlan_id: 100
                 description: Eth1 - VIF 100
                 mtu: 1402
 
               - vlan_id: 101
                 enabled: false
                 mtu: 1401
 
           - name: eth2
             description: Interface - 2
             enabled: true
             mtu: 1409
         state: merged
 
     - name: Gather interfaces facts
       vyos.vyos.vyos_facts:
         gather_subset:
           - default
         gather_network_resources:
           - interfaces
 
     - name: Apply the provided configuration (config to be reverted)
       register: result
       vyos.vyos.vyos_interfaces:
         config:
           - name: eth1
             description: Interface 1 - Description (WILL BE REVERTED)
             mtu: 1412
             vifs:
               - vlan_id: 100
                 description: Eth1 - VIF 100 (WILL BE REVERTED)
                 mtu: 1404
 
               - vlan_id: 101
                 description: Eth1 - VIF 101 (WILL BE REMOVED)
                 enabled: true
                 mtu: 1401
 
           - name: eth2
             description: Interface 2 (ADMIN DOWN) (WILL BE REVERTED)
             mtu: 1406
             enabled: false
         state: merged
 
     - name: Assert that changes were applied
       assert:
-        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
+        that: round_trip['after'] | symmetric_difference(result['after']) |length == 0
 
     - name: Revert back to base config using facts round trip
       register: revert
       vyos.vyos.vyos_interfaces:
         config: "{{ ansible_facts['network_resources']['interfaces'] }}"
         state: replaced
 
     - name: Assert that config was reverted
       assert:
-        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
+        that: base_config['after'] | symmetric_difference(revert['after']) |length == 0
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/vars/main.yaml b/tests/integration/targets/vyos_interfaces/vars/main.yaml
index 4e66747b..c65771f2 100644
--- a/tests/integration/targets/vyos_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_interfaces/vars/main.yaml
@@ -1,174 +1,199 @@
 ---
 merged:
   before:
     - name: eth0
       enabled: true
       speed: auto
       duplex: auto
     - name: eth1
       enabled: true
     - name: eth2
       enabled: true
   commands:
     - set interfaces ethernet eth1 description 'Configured by Ansible - Interface 1'
     - set interfaces ethernet eth1 mtu '1500'
+    - set interfaces ethernet eth1 duplex 'auto'
+    - set interfaces ethernet eth1 speed 'auto'
     - set interfaces ethernet eth1 vif 100 description 'Eth1 - VIF 100'
     - set interfaces ethernet eth1 vif 100 mtu '1404'
     - set interfaces ethernet eth1 vif 101 description 'Eth1 - VIF 101'
     - set interfaces ethernet eth2 description 'Configured by Ansible - Interface 2 (ADMIN DOWN)'
     - set interfaces ethernet eth2 mtu '1406'
     - set interfaces ethernet eth2 disable
   after:
     - name: eth0
       enabled: true
       duplex: auto
       speed: auto
     - name: eth1
       description: Configured by Ansible - Interface 1
       mtu: 1500
       enabled: true
+      duplex: auto
+      speed: auto
       vifs:
         - vlan_id: 100
           description: Eth1 - VIF 100
           mtu: 1404
           enabled: true
         - vlan_id: 101
           description: Eth1 - VIF 101
           enabled: true
     - name: eth2
       description: Configured by Ansible - Interface 2 (ADMIN DOWN)
       mtu: 1406
       enabled: false
 populate:
   - name: eth1
     enabled: true
     description: Configured by Ansible
     mtu: 1500
+    duplex: auto
+    speed: auto
     vifs:
       - vlan_id: 200
         enabled: true
         description: VIF - 200
   - name: eth2
     enabled: true
     description: Configured by Ansible
     mtu: 1500
+    duplex: auto
+    speed: auto
     vifs:
       - vlan_id: 200
         enabled: true
         description: VIF - 200
   - name: eth0
     enabled: true
     duplex: auto
     speed: auto
 replaced:
   commands:
     - delete interfaces ethernet eth1 mtu
+    - delete interfaces ethernet eth1 speed
+    - delete interfaces ethernet eth1 duplex
     - delete interfaces ethernet eth1 vif 200
     - set interfaces ethernet eth1 description 'Replaced by Ansible'
     - set interfaces ethernet eth1 vif 100 description 'VIF 100 - Replaced by Ansible'
     - delete interfaces ethernet eth2 vif 200
+    - delete interfaces ethernet eth2 speed
+    - delete interfaces ethernet eth2 duplex
     - set interfaces ethernet eth2 description 'Replaced by Ansible'
     - set interfaces ethernet eth2 mtu '1400'
   after:
     - name: eth1
       description: Replaced by Ansible
       enabled: true
       vifs:
         - vlan_id: 100
           enabled: true
           description: VIF 100 - Replaced by Ansible
     - name: eth2
       mtu: 1400
       description: Replaced by Ansible
       enabled: true
     - name: eth0
       enabled: true
       duplex: auto
       speed: auto
 parsed:
   after:
     - name: eth1
       description: Configured by Ansible - Interface 1
       mtu: 1500
       enabled: true
       vifs:
         - vlan_id: 100
           description: Eth1 - VIF 100
           mtu: 1404
           enabled: true
         - vlan_id: 101
           description: Eth1 - VIF 101
           enabled: true
     - name: eth2
       description: Configured by Ansible - Interface 2 (ADMIN DOWN)
       mtu: 1406
       enabled: false
 overridden:
   commands:
     - delete interfaces ethernet eth1 description
     - delete interfaces ethernet eth1 mtu
+    - delete interfaces ethernet eth1 speed
+    - delete interfaces ethernet eth1 duplex
     - delete interfaces ethernet eth1 vif 200
     - delete interfaces ethernet eth2 vif 200
+    - delete interfaces ethernet eth2 speed
+    - delete interfaces ethernet eth2 duplex
     - set interfaces ethernet eth2 description 'Overridden by Ansible'
     - set interfaces ethernet eth2 mtu '1402'
   after:
     - name: eth0
       enabled: true
       speed: auto
       duplex: auto
     - name: eth1
       enabled: true
     - name: eth2
       enabled: true
       description: Overridden by Ansible
       mtu: 1402
 rendered:
   commands:
+    - set interfaces ethernet eth0 duplex 'auto'
+    - set interfaces ethernet eth0 speed 'auto'
+    - set interfaces ethernet eth1 duplex 'auto'
+    - set interfaces ethernet eth1 speed 'auto'
     - set interfaces ethernet eth1 description 'Configured by Ansible - Interface 1'
     - set interfaces ethernet eth1 mtu '1500'
     - set interfaces ethernet eth1 vif 100 description 'Eth1 - VIF 100'
     - set interfaces ethernet eth1 vif 100 mtu '1404'
     - set interfaces ethernet eth1 vif 101 description 'Eth1 - VIF 101'
     - set interfaces ethernet eth2 description 'Configured by Ansible - Interface 2 (ADMIN DOWN)'
     - set interfaces ethernet eth2 mtu '1406'
 
 deleted:
   commands:
     - delete interfaces ethernet eth1 description
     - delete interfaces ethernet eth1 mtu
     - delete interfaces ethernet eth1 vif 200
+    - delete interfaces ethernet eth1 speed
+    - delete interfaces ethernet eth1 duplex
     - delete interfaces ethernet eth2 description
     - delete interfaces ethernet eth2 mtu
     - delete interfaces ethernet eth2 vif 200
+    - delete interfaces ethernet eth2 speed
+    - delete interfaces ethernet eth2 duplex
   after:
     - name: eth0
       enabled: true
       speed: auto
       duplex: auto
     - name: eth1
       enabled: true
     - name: eth2
       enabled: true
+
 round_trip:
   after:
     - name: eth0
       enabled: true
       speed: auto
       duplex: auto
     - name: eth1
       description: Interface 1 - Description (WILL BE REVERTED)
       enabled: true
       mtu: 1412
       vifs:
         - vlan_id: 100
           description: Eth1 - VIF 100 (WILL BE REVERTED)
           mtu: 1404
           enabled: true
         - vlan_id: 101
           description: Eth1 - VIF 101 (WILL BE REMOVED)
           enabled: true
           mtu: 1401
     - name: eth2
       description: Interface 2 (ADMIN DOWN) (WILL BE REVERTED)
       mtu: 1406
       enabled: false