diff --git a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
index 1a81fb1..5813284 100644
--- a/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
+++ b/tests/integration/targets/prepare_vyos_tests/tasks/main.yaml
@@ -1,13 +1,13 @@
 ---
 - name: Ensure required interfaces are present in running-config
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       set interfaces ethernet eth0 address dhcp
       set interfaces ethernet eth0 speed auto
       set interfaces ethernet eth0 duplex auto
       set interfaces ethernet eth1
       set interfaces ethernet eth2
       delete interfaces loopback lo
-  ignore_errors: yes
+  ignore_errors: true
diff --git a/tests/integration/targets/vyos_banner/tasks/main.yaml b/tests/integration/targets/vyos_banner/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_banner/tasks/main.yaml
+++ b/tests/integration/targets/vyos_banner/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_command/tasks/main.yaml b/tests/integration/targets/vyos_command/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_command/tasks/main.yaml
+++ b/tests/integration/targets/vyos_command/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml b/tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml
index bf3334f..5ff72fa 100644
--- a/tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml
+++ b/tests/integration/targets/vyos_command/tests/cli/bad_operator.yaml
@@ -1,19 +1,19 @@
 ---
 - debug: msg="START cli/bad_operator.yaml on connection={{ ansible_connection }}"
 
 - name: test bad operator
   vyos.vyos.vyos_command:
     commands:
       - show version
       - show interfaces
     wait_for:
       - result[0] is 'VyOS'
   register: result
-  ignore_errors: yes
+  ignore_errors: true
 
 - assert:
     that:
       - result.failed == true
       - result.msg is defined
 
 - debug: msg="END cli/bad_operator.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_command/tests/cli/cli_command.yaml b/tests/integration/targets/vyos_command/tests/cli/cli_command.yaml
index 08a7675..a10f2bc 100644
--- a/tests/integration/targets/vyos_command/tests/cli/cli_command.yaml
+++ b/tests/integration/targets/vyos_command/tests/cli/cli_command.yaml
@@ -1,41 +1,41 @@
 ---
 - debug:
     msg: "START cli/cli_command.yaml on connection={{ ansible_connection }}"
 
 - block:
-  - name: get output for single command
-    network.cli.cli_command:
-      command: show version
-    register: result
+    - name: get output for single command
+      network.cli.cli_command:
+        command: show version
+      register: result
 
-  - assert:
-      that:
-        - "result.changed == false"
-        - "result.stdout is defined"
+    - assert:
+        that:
+          - "result.changed == false"
+          - "result.stdout is defined"
 
-  - name: send invalid command
-    network.cli.cli_command:
-      command: 'show foo'
-    register: result
-    ignore_errors: yes
+    - name: send invalid command
+      network.cli.cli_command:
+        command: 'show foo'
+      register: result
+      ignore_errors: true
 
-  - assert:
-      that:
-        - "result.failed == true"
-        - "result.msg is defined"
+    - assert:
+        that:
+          - "result.failed == true"
+          - "result.msg is defined"
   when: "ansible_connection == 'network_cli'"
 
 - block:
-  - name: test failure for local connection
-    network.cli.cli_command:
-      command: show version
-    register: result
-    ignore_errors: yes
+    - name: test failure for local connection
+      network.cli.cli_command:
+        command: show version
+      register: result
+      ignore_errors: true
 
-  - assert:
-      that:
-        - 'result.failed == true'
-        - "'Connection type local is not valid for this module' in result.msg"
+    - assert:
+        that:
+          - 'result.failed == true'
+          - "'Connection type local is not valid for this module' in result.msg"
   when: "ansible_connection == 'local'"
 
 - debug: msg="END cli/cli_command.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_command/tests/cli/invalid.yaml b/tests/integration/targets/vyos_command/tests/cli/invalid.yaml
index 672f6e8..04d203d 100644
--- a/tests/integration/targets/vyos_command/tests/cli/invalid.yaml
+++ b/tests/integration/targets/vyos_command/tests/cli/invalid.yaml
@@ -1,22 +1,22 @@
 ---
 - debug: msg="START cli/invalid.yaml on connection={{ ansible_connection }}"
 
 - name: run invalid command
   vyos.vyos.vyos_command:
     commands: show foo
   register: result
-  ignore_errors: yes
+  ignore_errors: true
 
-- assert: { that: result.failed }
+- assert: {that: result.failed}
 
 - name: run commands that include invalid command
   vyos.vyos.vyos_command:
     commands:
       - show version
       - show foo
   register: result
-  ignore_errors: yes
+  ignore_errors: true
 
-- assert: { that: result.failed }
+- assert: {that: result.failed}
 
 - debug: msg="END cli/invalid.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_command/tests/cli/output.yaml b/tests/integration/targets/vyos_command/tests/cli/output.yaml
index bdc8b2a..1bc0dc6 100644
--- a/tests/integration/targets/vyos_command/tests/cli/output.yaml
+++ b/tests/integration/targets/vyos_command/tests/cli/output.yaml
@@ -1,44 +1,44 @@
 ---
 - debug: msg="START cli/output.yaml on connection={{ ansible_connection }}"
 
 - name: get output for single command
   vyos.vyos.vyos_command:
     commands: show version
   register: result
 
 - assert:
     that:
       - result.changed == false
       - result.stdout is defined
       - result.stdout_lines is defined
 
 - name: get output for multiple commands
   vyos.vyos.vyos_command:
     commands:
       - show version
       - show interfaces
   register: result
 
 - assert:
     that:
       - result.changed == false
       - result.stdout is defined
       - result.stdout | length == 2
 
 - name: Get output for multiple commands that call less explicitly
   vyos.vyos.vyos_command:
     commands:
-        # NOTE: We only test show commands that will output <ANSIBLE_VYOS_TERMINAL_LENGTH
-        # Otherwise you will get ": "command timeout triggered"
+      # NOTE: We only test show commands that will output <ANSIBLE_VYOS_TERMINAL_LENGTH
+      # Otherwise you will get ": "command timeout triggered"
       - show hardware cpu detail
       - show hardware mem
       - show license
   register: result
 
 - assert:
     that:
       - result.changed == false
       - result.stdout_lines is defined
       - result.stdout_lines[2] | length >= 20
 
 - debug: msg="END cli/output.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_command/tests/cli/timeout.yaml b/tests/integration/targets/vyos_command/tests/cli/timeout.yaml
index e4716ed..57120ac 100644
--- a/tests/integration/targets/vyos_command/tests/cli/timeout.yaml
+++ b/tests/integration/targets/vyos_command/tests/cli/timeout.yaml
@@ -1,18 +1,18 @@
 ---
 - debug: msg="START cli/timeout.yaml on connection={{ ansible_connection }}"
 
 - name: test bad condition
   vyos.vyos.vyos_command:
     commands:
       - show version
     wait_for:
       - result[0] contains bad_value_string
   register: result
-  ignore_errors: yes
+  ignore_errors: true
 
 - assert:
     that:
       - result.failed == true
       - result.msg is defined
 
 - debug: msg="END cli/timeout.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_config/tasks/main.yaml b/tests/integration/targets/vyos_config/tasks/main.yaml
index 5e327e8..13977a4 100644
--- a/tests/integration/targets/vyos_config/tasks/main.yaml
+++ b/tests/integration/targets/vyos_config/tasks/main.yaml
@@ -1,3 +1,3 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
-- { include: cli_config.yaml, tags: ['cli_config'] }
+- {include: cli.yaml, tags: ['cli']}
+- {include: cli_config.yaml, tags: ['cli_config']}
diff --git a/tests/integration/targets/vyos_config/tests/cli/backup.yaml b/tests/integration/targets/vyos_config/tests/cli/backup.yaml
index 0ef0986..af6a772 100644
--- a/tests/integration/targets/vyos_config/tests/cli/backup.yaml
+++ b/tests/integration/targets/vyos_config/tests/cli/backup.yaml
@@ -1,113 +1,113 @@
 ---
 - debug: msg="START vyos/backup.yaml on connection={{ ansible_connection }}"
 
 - name: collect any backup files
   find:
     paths: "{{ role_path }}/backup"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_files
   connection: local
 
 - name: delete backup files
   file:
     path: "{{ item.path }}"
     state: absent
   with_items: "{{backup_files.files|default([])}}"
 
 - name: take configure backup
   vyos.vyos.vyos_config:
-    backup: yes
+    backup: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: collect any backup files
   find:
     paths: "{{ role_path }}/backup"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_files
   connection: local
 
 - assert:
     that:
       - "backup_files.files is defined"
 
 - name: delete configurable backup file path
   file:
     path: "{{ item }}"
     state: absent
   with_items:
     - "{{ role_path }}/backup_test_dir/"
     - "{{ role_path }}/backup/backup.cfg"
 
 - name: take configuration backup in custom filename and directory path
   vyos.vyos.vyos_config:
-    backup: yes
+    backup: true
     backup_options:
       filename: backup.cfg
       dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-1 exist
   find:
     paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}/backup.cfg"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom filename
   vyos.vyos.vyos_config:
-    backup: yes
+    backup: true
     backup_options:
       filename: backup.cfg
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-2 exist
   find:
     paths: "{{ role_path }}/backup/backup.cfg"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom path and default filename
   vyos.vyos.vyos_config:
-    backup: yes
+    backup: true
     backup_options:
       dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-3 exist
   find:
     paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - debug: msg="END vyos/backup.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_config/tests/cli/check_config.yaml b/tests/integration/targets/vyos_config/tests/cli/check_config.yaml
index b90ec7b..f1ddc71 100644
--- a/tests/integration/targets/vyos_config/tests/cli/check_config.yaml
+++ b/tests/integration/targets/vyos_config/tests/cli/check_config.yaml
@@ -1,63 +1,63 @@
 ---
 - debug: msg="START cli/config_check.yaml on connection={{ ansible_connection }}"
 
 - name: setup- ensure interface is not present
   vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
 
 - name: setup- create interface
   vyos.vyos.vyos_config:
     lines:
       - interfaces
       - interfaces loopback lo
       - interfaces loopback lo description test
   register: result
 
 # note collapsing the duplicate lines doesn't work if
 # lines:
 #   - interfaces loopback lo description test
 #   - interfaces loopback lo
 #   - interfaces
 
 - name: Check that multiple duplicate lines collapse into a single commands
   assert:
     that:
       - "{{ result.commands|length }} == 1"
 
 - name: Check that set is correctly prepended
   assert:
     that:
       - "result.commands[0] == 'set interfaces loopback lo description test'"
 
 - name: configure config_check config command
   vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check config_check config command idempontent
   vyos.vyos.vyos_config:
     lines: delete interfaces loopback lo
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
 - name: check multiple line config filter is working
   vyos.vyos.vyos_config:
-      lines:
-          - set system login user esa level admin
-          - set system login user esa authentication encrypted-password '!abc!'
-          - set system login user vyos level admin
-          - set system login user vyos authentication encrypted-password 'abc'
+    lines:
+      - set system login user esa level admin
+      - set system login user esa authentication encrypted-password '!abc!'
+      - set system login user vyos level admin
+      - set system login user vyos authentication encrypted-password 'abc'
   register: result
 
 - assert:
     that:
       - "{{ result.filtered|length }} == 2"
 
 - debug: msg="END cli/config_check.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml b/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
index 8057705..a573d6c 100644
--- a/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
+++ b/tests/integration/targets/vyos_config/tests/cli_config/cli_backup.yaml
@@ -1,113 +1,114 @@
+---
 - debug: msg="END cli_config/backup.yaml on connection={{ ansible_connection }}"
 
 - name: delete configurable backup file path
   file:
     path: "{{ item }}"
     state: absent
   with_items:
     - "{{ role_path }}/backup_test_dir/"
     - "{{ role_path }}/backup/backup.cfg"
 
 - name: collect any backup files
   find:
     paths: "{{ role_path }}/backup"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_files
   connection: local
 
 - name: delete backup files
   file:
     path: "{{ item.path }}"
     state: absent
   with_items: "{{backup_files.files|default([])}}"
 
 - name: take config backup
   network.cli.cli_config:
-    backup: yes
-  become: yes
+    backup: true
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: collect any backup files
   find:
     paths: "{{ role_path }}/backup"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_files
   connection: local
 
 - assert:
     that:
       - "backup_files.files is defined"
 
 - name: take configuration backup in custom filename and directory path
   network.cli.cli_config:
-    backup: yes
+    backup: true
     backup_options:
       filename: backup.cfg
       dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-1 exist
   find:
     paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}/backup.cfg"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom filename
   network.cli.cli_config:
-    backup: yes
+    backup: true
     backup_options:
       filename: backup.cfg
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-2 exist
   find:
     paths: "{{ role_path }}/backup/backup.cfg"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - name: take configuration backup in custom path and default filename
   network.cli.cli_config:
-    backup: yes
+    backup: true
     backup_options:
       dir_path: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
-  become: yes
+  become: true
   register: result
 
 - assert:
     that:
       - "result.changed == true"
 
 - name: check if the backup file-3 exist
   find:
     paths: "{{ role_path }}/backup_test_dir/{{ inventory_hostname_short }}"
     pattern: "{{ inventory_hostname_short }}_config*"
   register: backup_file
   connection: local
 
 - assert:
     that:
       - "backup_file.files is defined"
 
 - debug: msg="END cli_config/backup.yaml on connection={{ ansible_connection }}"
diff --git a/tests/integration/targets/vyos_facts/tasks/main.yaml b/tests/integration/targets/vyos_facts/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_facts/tasks/main.yaml
+++ b/tests/integration/targets/vyos_facts/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml b/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
index e0a3bca..33382ea 100644
--- a/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
+++ b/tests/integration/targets/vyos_facts/tests/cli/basic_facts.yaml
@@ -1,45 +1,46 @@
+---
 - name: get host name
   vyos.vyos.vyos_command:
     commands:
       - show host name
   register: vyos_host
 
 - name: get version info
   vyos.vyos.vyos_command:
     commands:
       - show version
   register: vyos_version
 
 - name: collect all facts from the device
   vyos.vyos.vyos_facts:
     gather_subset: all
   register: result
 
 - name: "check that hostname is present"
   assert:
     that:
       # hostname
       - result.ansible_facts.ansible_net_hostname == vyos_host.stdout[0]
 
 - name: "check that subsets are present"
   assert:
     that:
       # subsets
       - "'neighbors' in result.ansible_facts.ansible_net_gather_subset"
       - "'default' in result.ansible_facts.ansible_net_gather_subset"
       - "'config' in result.ansible_facts.ansible_net_gather_subset"
 
 - name: "check that version info is present"
   assert:
     that:
       # version info
       - result.ansible_facts.ansible_net_version in vyos_version.stdout_lines[0][0]
       - result.ansible_facts.ansible_net_model in vyos_version.stdout_lines[0][9]
       - result.ansible_facts.ansible_net_serialnum in vyos_version.stdout_lines[0][10]
 
 - name: "check that config info is present"
   assert:
     that:
       # config info
       - result.ansible_facts.ansible_net_commits is defined
       - result.ansible_facts.ansible_net_config is defined
diff --git a/tests/integration/targets/vyos_interface/tasks/main.yaml b/tests/integration/targets/vyos_interface/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_interface/tasks/main.yaml
+++ b/tests/integration/targets/vyos_interface/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_interface/tests/cli/basic.yaml
index 22957e1..168d666 100644
--- a/tests/integration/targets/vyos_interface/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_interface/tests/cli/basic.yaml
@@ -1,220 +1,220 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Run vyos lsmod command
   vyos.vyos.vyos_command:
     commands:
       - lsmod
   register: lsmod_out
 
 - name: Set up - delete interface
   vyos.vyos.vyos_interface:
     name: eth1
     state: absent
 
 - name: Set up - Create interface
   vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1" in result.commands'
       - '"set interfaces ethernet eth1 description ''test-interface''" in result.commands'
 
 - name: Configure interface params
   vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-1
     speed: 100
     duplex: half
     mtu: 256
   when: "'virtio_net' not in lsmod_out.stdout[0]"
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 description ''test-interface-1''" in result.commands'
       - '"set interfaces ethernet eth1 speed 100" in result.commands'
       - '"set interfaces ethernet eth1 duplex half" in result.commands'
       - '"set interfaces ethernet eth1 mtu 256" in result.commands'
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Configure interface params (idempotent)
   vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-1
     speed: 100
     duplex: half
     mtu: 256
   register: result
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
       - 'result.changed == false'
   when: "'virtio' not in lsmod_out.stdout[0]"
 
 - name: Change interface params
   vyos.vyos.vyos_interface:
     name: eth1
     state: present
     description: test-interface-2
     speed: 1000
     duplex: full
     mtu: 512
   register: result
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 description ''test-interface-2''" in result.commands'
       - '"set interfaces ethernet eth1 speed 1000" in result.commands'
       - '"set interfaces ethernet eth1 duplex full" in result.commands'
       - '"set interfaces ethernet eth1 mtu 512" in result.commands'
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: False
+    enabled: false
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 disable" in result.commands'
 
 - name: Enable interface
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: True
+    enabled: true
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 disable" in result.commands'
 
 - name: Delete interface
   vyos.vyos.vyos_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1" in result.commands'
 
 - name: Delete interface (idempotent)
   vyos.vyos.vyos_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Aggregate setup- delete interface
   vyos.vyos.vyos_interface:
     name: eth2
     state: absent
   register: result
 
 - name: Set interface on aggregate
   vyos.vyos.vyos_interface:
     aggregate:
-      - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
-      - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
+      - {name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
+      - {name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
   register: result
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 description ''test-interface-1''" in result.commands'
       - '"set interfaces ethernet eth1 speed 100" in result.commands'
       - '"set interfaces ethernet eth1 duplex half" in result.commands'
       - '"set interfaces ethernet eth1 mtu 512" in result.commands'
       - '"set interfaces ethernet eth2 description ''test-interface-2''" in result.commands'
       - '"set interfaces ethernet eth2 speed 1000" in result.commands'
       - '"set interfaces ethernet eth2 duplex full" in result.commands'
       - '"set interfaces ethernet eth2 mtu 256" in result.commands'
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Set interface on aggregate (idempotent)
   vyos.vyos.vyos_interface:
     aggregate:
-      - { name: eth1, description: test-interface-1,  speed: 100, duplex: half, mtu: 512}
-      - { name: eth2, description: test-interface-2,  speed: 1000, duplex: full, mtu: 256}
+      - {name: eth1, description: test-interface-1, speed: 100, duplex: half, mtu: 512}
+      - {name: eth2, description: test-interface-2, speed: 1000, duplex: full, mtu: 256}
   register: result
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - assert:
     that:
       - 'result.changed == false'
   when: "'virtio_net' not in lsmod_out.stdout[0]"
 
 - name: Disable interface on aggregate
   vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
     description: test-interface
-    enabled: False
+    enabled: false
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 disable" in result.commands'
       - '"set interfaces ethernet eth2 disable" in result.commands'
 
 - name: Enable interface on aggregate
   vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
-    enabled: True
+    enabled: true
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 disable" in result.commands'
       - '"delete interfaces ethernet eth2 disable" in result.commands'
 
 - name: Delete interface aggregate
   vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1" in result.commands'
       - '"delete interfaces ethernet eth2" in result.commands'
 
 - name: Delete interface aggregate (idempotent)
   vyos.vyos.vyos_interface:
     aggregate:
       - name: eth1
       - name: eth2
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
diff --git a/tests/integration/targets/vyos_interface/tests/cli/intent.yaml b/tests/integration/targets/vyos_interface/tests/cli/intent.yaml
index 946728d..1c14a7b 100644
--- a/tests/integration/targets/vyos_interface/tests/cli/intent.yaml
+++ b/tests/integration/targets/vyos_interface/tests/cli/intent.yaml
@@ -1,157 +1,157 @@
 ---
-- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}" #"
+- debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}"
 
 # To be able to run the lldp test we need to have a neighbor configured to talk to
 # In DCI & Zuul we (currently) only spin up a single network VM, so we can't configure a neighbor
 # In the future when we have multi-network-nodes running we can run these tests again
 # https://github.com/ansible/ansible/issues/39667
 
 - name: Detect if we have existing lldp neighbors configured
   vyos.vyos.vyos_command:
     commands:
       - show lldp neighbors detail
   register: neighbors_out
 
 - name: Should we run lldp tests?
   set_fact:
     run_lldp_tests: "'PortDescr:    eth0' in neighbors_out.stdout[0]"
 
 - name: Enable LLDP service
   vyos.vyos.vyos_lldp:
     state: present
   when: run_lldp_tests
 
 - name: Create LLDP configuration
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   when: run_lldp_tests
 
 - name: Setup (interface is up)
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: True
+    enabled: true
     state: present
   register: result
 
 - name: Check intent arguments
   vyos.vyos.vyos_interface:
     name: eth1
     state: up
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
 - name: Check lldp neighbors intent arguments
   vyos.vyos.vyos_interface:
     name: eth0
     neighbors:
-    - port: eth0
+      - port: eth0
   when: run_lldp_tests
   register: result
 
 - assert:
     that:
       - "result.failed == false"
   when: run_lldp_tests
 
 - name: Check intent arguments (failed condition)
   vyos.vyos.vyos_interface:
     name: eth1
     state: down
-  ignore_errors: yes
+  ignore_errors: true
   register: result
 
 - assert:
     that:
       - "result.failed == true"
       - "'state eq(down)' in result.failed_conditions"
 
 - name: Check lldp neighbors intent arguments (failed)
   vyos.vyos.vyos_interface:
     name: eth0
     neighbors:
-    - port: dummy_port
-      host: dummy_host
-  ignore_errors: yes
+      - port: dummy_port
+        host: dummy_host
+  ignore_errors: true
   when: run_lldp_tests
   register: result
 
 - assert:
     that:
       - "result.failed == true"
       - "'host dummy_host' in result.failed_conditions"
       - "'port dummy_port' in result.failed_conditions"
   when: run_lldp_tests
 
 - name: Config + intent
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: False
+    enabled: false
     state: down
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
 - name: Config + intent (fail)
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: False
+    enabled: false
     state: up
-  ignore_errors: yes
+  ignore_errors: true
   register: result
 
 - assert:
     that:
       - "result.failed == true"
       - "'state eq(up)' in result.failed_conditions"
 
 - name: Aggregate config + intent (pass)
   vyos.vyos.vyos_interface:
     aggregate:
-    - name: eth1
-      enabled: True
-      state: up
-  ignore_errors: yes
+      - name: eth1
+        enabled: true
+        state: up
+  ignore_errors: true
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
 - name: Check lldp neighbors intent aggregate arguments
   vyos.vyos.vyos_interface:
     aggregate:
-    - name: eth0
-      neighbors:
-      - port: eth0
+      - name: eth0
+        neighbors:
+          - port: eth0
   when: run_lldp_tests
   register: result
 
 - assert:
     that:
       - "result.failed == false"
   when: run_lldp_tests
 
 - name: Check lldp neighbors intent aggregate arguments (failed)
   vyos.vyos.vyos_interface:
     aggregate:
-    - name: eth0
-      neighbors:
-      - port: eth0
-      - port: dummy_port
-        host: dummy_host
-  ignore_errors: yes
+      - name: eth0
+        neighbors:
+          - port: eth0
+          - port: dummy_port
+            host: dummy_host
+  ignore_errors: true
   when: run_lldp_tests
   register: result
 
 - assert:
     that:
       - "result.failed == true"
       - "'host dummy_host' in result.failed_conditions"
       - "'port dummy_port' in result.failed_conditions"
   when: run_lldp_tests
diff --git a/tests/integration/targets/vyos_interfaces/meta/main.yaml b/tests/integration/targets/vyos_interfaces/meta/main.yaml
index e380a13..7413320 100644
--- a/tests/integration/targets/vyos_interfaces/meta/main.yaml
+++ b/tests/integration/targets/vyos_interfaces/meta/main.yaml
@@ -1,2 +1,3 @@
+---
 dependencies:
-  - prepare_vyos_tests
\ No newline at end of file
+  - prepare_vyos_tests
diff --git a/tests/integration/targets/vyos_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_interfaces/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_interfaces/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
index 0a44fa4..4dd5f18 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/_populate.yaml
@@ -1,17 +1,17 @@
 ---
 - name: Setup
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       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'
   loop:
     - eth1
     - eth2
   loop_control:
-    loop_var: intf
\ No newline at end of file
+    loop_var: intf
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
index ce4723d..9157f55 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/_remove_config.yaml
@@ -1,17 +1,17 @@
 ---
 - name: Remove Config
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       delete interfaces ethernet "{{ intf }}" description
       delete interfaces ethernet "{{ intf }}" speed
       delete interfaces ethernet "{{ intf }}" duplex
       delete interfaces ethernet "{{ intf }}" mtu
       delete interfaces ethernet "{{ intf }}" disable
       delete interfaces ethernet "{{ intf }}" vif
   loop:
     - eth1
     - eth2
   loop_control:
-    loop_var: intf
\ No newline at end of file
+    loop_var: intf
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/deleted.yaml
index b48f916..fc86ca7 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:  
+- block:
     - name: Delete attributes of given interfaces
       vyos.vyos.vyos_interfaces: &deleted
         config:
           - name: eth1
           - name: eth2
         state: deleted
       register: result
 
     - name: Assert that the before dicts were correctly generated
       assert:
         that:
           - "{{ 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 }}"
 
     - name: Assert that the after dicts were correctly generated
       assert:
         that:
           - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Delete attributes of given interfaces (IDEMPOTENT)
       vyos.vyos.vyos_interfaces: *deleted
       register: result
 
     - 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 }}"
 
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/empty_config.yaml
index ab68fde..4a72c8a 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/empty_config.yaml
@@ -1,36 +1,36 @@
 ---
 - debug:
-      msg: "START vyos_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_interfaces empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_interfaces:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
   vyos.vyos.vyos_interfaces:
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
 
 - name: Overridden with empty config should give appropriate error message
   vyos.vyos.vyos_interfaces:
     config:
     state: overridden
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state overridden'
diff --git a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
index 89ed893..50e4936 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/merged.yaml
@@ -1,59 +1,59 @@
 ---
 - debug:
-      msg: "START vyos_interfaces merged integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_interfaces merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
     - name: Merge the provided configuration with the exisiting running configuration
       vyos.vyos.vyos_interfaces: &merged
         config:
           - name: eth1
             description: "Configured by Ansible - Interface 1"
             mtu: 1500
             speed: auto
             duplex: auto
             vifs:
               - vlan_id: 100
                 description: "Eth1 - VIF 100"
                 mtu: 400
 
               - vlan_id: 101
                 description: "Eth1 - VIF 101"
 
           - name: eth2
             description: "Configured by Ansible - Interface 2 (ADMIN DOWN)"
             mtu: 600
             enabled: false
         state: merged
       register: result
 
     - name: Assert that before dicts were correctly generated
       assert:
         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 }}"
 
     - name: Assert that after dicts was correctly generated
       assert:
         that:
           - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
       vyos.vyos.vyos_interfaces: *merged
       register: result
 
     - 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 }}"
   always:
-      - include_tasks: _remove_config.yaml
+    - 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 c9eb1b7..74669f7 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/overridden.yaml
@@ -1,52 +1,52 @@
 ---
 - debug:
-      msg: "START vyos_interfaces overridden integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_interfaces overridden integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Overrides all device configuration with provided configuration
       vyos.vyos.vyos_interfaces: &overridden
         config:
           - name: eth0
             speed: "auto"
             duplex: "auto"
           - name: eth2
             description: "Overridden by Ansible"
             mtu: 1200
         state: overridden
       register: result
 
     - 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 }}"
 
     - name: Assert that after dicts were correctly generated
       assert:
         that:
           - "{{ overridden['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
       vyos.vyos.vyos_interfaces: *overridden
       register: result
 
     - 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 }}"
-  
+
   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 1211f63..64510d7 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/replaced.yaml
@@ -1,55 +1,55 @@
 ---
 - debug:
-      msg: "START vyos_interfaces replaced integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_interfaces replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
     - name: Replace device configurations of listed interfaces with provided configurations
       vyos.vyos.vyos_interfaces: &replaced
         config:
           - name: eth1
             description: "Replaced by Ansible"
             vifs:
-                - vlan_id: 100
-                  description: "VIF 100 - Replaced by Ansible"
+              - vlan_id: 100
+                description: "VIF 100 - Replaced by Ansible"
 
           - name: eth2
             mtu: 1400
             description: "Replaced by Ansible"
         state: replaced
       register: result
 
     - name: Assert that correct set of commands were generated
       assert:
-       that:
-         - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+        that:
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
     - name: Assert that before dicts are correctly generated
       assert:
         that:
           - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
 
     - name: Assert that after dict is correctly generated
       assert:
         that:
           - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Replace device configurations of listed interfaces with provided configurarions (IDEMPOTENT)
       vyos.vyos.vyos_interfaces: *replaced
       register: result
 
     - name: Assert that task was idempotent
       assert:
-       that:
-         - "result['changed'] == false"
+        that:
+          - "result['changed'] == false"
 
     - name: Assert that before dict is correctly generated
       assert:
-       that:
-         - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+        that:
+          - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-    - include_tasks: _remove_config.yaml
\ No newline at end of file
+    - 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 3ec4d3d..f947513 100644
--- a/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_interfaces/tests/cli/rtt.yaml
@@ -1,78 +1,78 @@
 ---
 - 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)
       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: 200
 
               - vlan_id: 101
                 enabled: false
 
           - name: eth2
             description: "Interface - 2"
             enabled: true
             mtu: 900
         state: merged
       register: base_config
 
     - name: Gather interfaces facts
       vyos.vyos.vyos_facts:
         gather_subset:
           - default
         gather_network_resources:
           - interfaces
 
     - name: Apply the provided configuration (config to be reverted)
       vyos.vyos.vyos_interfaces:
         config:
           - name: eth1
             description: "Interface 1 - Description (WILL BE REVERTED)"
             mtu: 1200
             vifs:
               - vlan_id: 100
                 description: "Eth1 - VIF 100 (WILL BE REVERTED)"
                 mtu: 400
 
               - vlan_id: 101
                 description: "Eth1 - VIF 101 (WILL BE REMOVED)"
                 enabled: true
 
           - name: eth2
             description: "Interface 2 (ADMIN DOWN) (WILL BE REVERTED)"
             mtu: 600
             enabled: false
         state: merged
       register: result
 
     - name: Assert that changes were applied
       assert:
         that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
     - name: Revert back to base config using facts round trip
       vyos.vyos.vyos_interfaces:
         config: "{{ ansible_facts['network_resources']['interfaces'] }}"
         state: replaced
       register: revert
 
     - name: Assert that config was reverted
       assert:
         that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
-  
+
   always:
     - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_l3_interface/tasks/main.yaml b/tests/integration/targets/vyos_l3_interface/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_l3_interface/tasks/main.yaml
+++ b/tests/integration/targets/vyos_l3_interface/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
index 9ad6955..3c24b11 100644
--- a/tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_l3_interface/tests/cli/basic.yaml
@@ -1,203 +1,203 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Remove IP address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
 
 - name: Remove IP address
   vyos.vyos.vyos_l3_interface:
     name: eth2
     state: absent
 
 - name: Set IPv4 address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
 
 - name: Set IPv4 address (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Set IPv6 address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Set IPv6 address (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove all IP addresses
   vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 address" in result.commands'
 
 - name: Remove all IP addresses again (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Set IPv4 and IPv6 address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
       - '"set interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Set IPv4 and IPv6 address again (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     ipv6: fd5d:12c9:2201:1::1/64
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove IPv4 address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
 
 - name: Remove IPv4 address again (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv4: 192.168.2.10/24
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove IPv6 address
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 address fd5d:12c9:2201:1::1/64" in result.commands'
 
 - name: Remove IPv6 address again (idempotent)
   vyos.vyos.vyos_l3_interface:
     name: eth1
     ipv6: fd5d:12c9:2201:1::1/64
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Set IP addresses on aggregate
   vyos.vyos.vyos_l3_interface:
     aggregate:
-      - { name: eth1, ipv4: 192.168.2.10/24 }
-      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
-      - { name: eth2, ipv4: 192.168.4.10/24 }
+      - {name: eth1, ipv4: 192.168.2.10/24}
+      - {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
+      - {name: eth2, ipv4: 192.168.4.10/24}
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
       - '"set interfaces ethernet eth2 address 192.168.3.10/24" in result.commands'
       - '"set interfaces ethernet eth2 address fd5d:12c9:2201:1::1/64" in result.commands'
       - '"set interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
 
 - name: Set IP addresses on aggregate (idempotent)
   vyos.vyos.vyos_l3_interface:
     aggregate:
-      - { name: eth1, ipv4: 192.168.2.10/24 }
-      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
-      - { name: eth2, ipv4: 192.168.4.10/24 }
+      - {name: eth1, ipv4: 192.168.2.10/24}
+      - {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
+      - {name: eth2, ipv4: 192.168.4.10/24}
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove IP addresses on aggregate
   vyos.vyos.vyos_l3_interface:
     aggregate:
-      - { name: eth1, ipv4: 192.168.2.10/24 }
-      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
-      - { name: eth2, ipv4: 192.168.4.10/24 }
+      - {name: eth1, ipv4: 192.168.2.10/24}
+      - {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
+      - {name: eth2, ipv4: 192.168.4.10/24}
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 address 192.168.2.10/24" in result.commands'
       - '"delete interfaces ethernet eth2 address 192.168.3.10/24" in result.commands'
       - '"delete interfaces ethernet eth2 address fd5d:12c9:2201:1::1/64" in result.commands'
       - '"delete interfaces ethernet eth2 address 192.168.4.10/24" in result.commands'
 
 - name: Remove IP addresses on aggregate (idempotent)
   vyos.vyos.vyos_l3_interface:
     aggregate:
-      - { name: eth1, ipv4: 192.168.2.10/24 }
-      - { name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64" }
-      - { name: eth2, ipv4: 192.168.4.10/24 }
+      - {name: eth1, ipv4: 192.168.2.10/24}
+      - {name: eth2, ipv4: 192.168.3.10/24, ipv6: "fd5d:12c9:2201:1::1/64"}
+      - {name: eth2, ipv4: 192.168.4.10/24}
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
diff --git a/tests/integration/targets/vyos_l3_interfaces/meta/main.yml b/tests/integration/targets/vyos_l3_interfaces/meta/main.yml
index e380a13..7413320 100644
--- a/tests/integration/targets/vyos_l3_interfaces/meta/main.yml
+++ b/tests/integration/targets/vyos_l3_interfaces/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-  - prepare_vyos_tests
\ No newline at end of file
+  - prepare_vyos_tests
diff --git a/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
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 fc0bbb2..d598c42 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/_populate.yaml
@@ -1,11 +1,11 @@
 ---
 - name: Setup
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       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'
\ No newline at end of file
+      set interfaces ethernet eth2 address '2001:db8::12/32'
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 a40901c..b95bcdb 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/deleted.yaml
@@ -1,48 +1,48 @@
 ---
 - debug:
     msg: "Start vyos_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - include_tasks: _populate.yaml
-
-  - name: Delete attributes of given interfaces
-    vyos.vyos.vyos_l3_interfaces: &deleted
-      config:
-        - name: eth1
-        - name: eth2
-      state: deleted
-    register: result
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ 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 }}"
-
-  - name: Assert that the after dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Delete attributes of given interfaces (IDEMPOTENT)
-    vyos.vyos.vyos_l3_interfaces: *deleted
-    register: result
-
-  - 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 }}"
+    - include_tasks: _populate.yaml
+
+    - name: Delete attributes of given interfaces
+      vyos.vyos.vyos_l3_interfaces: &deleted
+        config:
+          - name: eth1
+          - name: eth2
+        state: deleted
+      register: result
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ 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 }}"
+
+    - name: Assert that the after dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Delete attributes of given interfaces (IDEMPOTENT)
+      vyos.vyos.vyos_l3_interfaces: *deleted
+      register: result
+
+    - 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 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/empty_config.yaml
index 530df88..7b1f100 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/empty_config.yaml
@@ -1,36 +1,36 @@
 ---
 - debug:
-      msg: "START vyos_l3_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_l3_interfaces empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_l3_interfaces:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
   vyos.vyos.vyos_l3_interfaces:
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
 
 - name: Overridden with empty config should give appropriate error message
   vyos.vyos.vyos_l3_interfaces:
     config:
     state: overridden
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state overridden'
diff --git a/tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
index 64724ef..1b3b9ea 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/merged.yaml
@@ -1,58 +1,58 @@
 ---
 - debug:
     msg: "START vyos_l3_interfaces merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Merge the provided configuration with the exisiting running configuration
-    vyos.vyos.vyos_l3_interfaces: &merged
-      config:
-        - 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
-      state: merged
-    register: result
-
-  - name: Assert that before dicts were correctly generated
-    assert:
-      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 }}"
-
-  - name: Assert that after dicts was correctly generated
-    assert:
-      that:
-        - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-    vyos.vyos.vyos_l3_interfaces: *merged
-    register: result
-
-  - 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 }}"
+    - name: Merge the provided configuration with the exisiting running configuration
+      vyos.vyos.vyos_l3_interfaces: &merged
+        config:
+          - 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
+        state: merged
+      register: result
+
+    - name: Assert that before dicts were correctly generated
+      assert:
+        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 }}"
+
+    - name: Assert that after dicts was correctly generated
+      assert:
+        that:
+          - "{{ merged['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      vyos.vyos.vyos_l3_interfaces: *merged
+      register: result
+
+    - 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 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
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 6a9b013..06d6fc7 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/overridden.yaml
@@ -1,52 +1,52 @@
 ---
 - debug:
     msg: "START vyos_l3_interfaces merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - include_tasks: _populate.yaml
-
-  - name: Overrides all device configuration with provided configuration
-    vyos.vyos.vyos_l3_interfaces: &overridden
-      config:
-        - name: eth0
-          ipv4:
-            - address: dhcp
-        - name: eth1
-          ipv4:
-            - address: "192.0.2.15/24"
-      state: overridden
-    register: result
-
-  - name: Assert that before dicts were correctly generated
-    assert:
-      that:
-        - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
-
-  - name: Assert that correct commands were generated
-    assert:
-      that:
-        - "{{ 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 }}"
-
-  - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
-    vyos.vyos.vyos_l3_interfaces: *overridden
-    register: result
-
-  - 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 }}"
+    - include_tasks: _populate.yaml
+
+    - name: Overrides all device configuration with provided configuration
+      vyos.vyos.vyos_l3_interfaces: &overridden
+        config:
+          - name: eth0
+            ipv4:
+              - address: dhcp
+          - name: eth1
+            ipv4:
+              - address: "192.0.2.15/24"
+        state: overridden
+      register: result
+
+    - name: Assert that before dicts were correctly generated
+      assert:
+        that:
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+
+    - name: Assert that correct commands were generated
+      assert:
+        that:
+          - "{{ 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 }}"
+
+    - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
+      vyos.vyos.vyos_l3_interfaces: *overridden
+      register: result
+
+    - 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 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
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 4d44983..6f1228a 100644
--- a/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/tests/cli/replaced.yaml
@@ -1,52 +1,52 @@
 ---
 - debug:
     msg: "START vyos_l3_interfaces replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - include_tasks: _populate.yaml
-
-  - name: Replace device configurations of listed interfaces with provided configurations
-    vyos.vyos.vyos_l3_interfaces: &replaced
-      config:
-        - name: eth1
-          ipv4:
-            - address: 192.0.2.19/24
-        - name: eth2
-          ipv6:
-            - address: 2001:db8::11/32
-      state: replaced
-    register: result
-
-  - name: Assert that correct set of commands were generated
-    assert:
-      that:
-        - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
-
-  - name: Assert that before dicts are correctly generated
-    assert:
-      that:
-        - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
-
-  - name: Assert that after dict is correctly generated
-    assert:
-      that:
-        - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Replace device configurations of listed interfaces with provided configurarions (IDEMPOTENT)
-    vyos.vyos.vyos_l3_interfaces: *replaced
-    register: result
-
-  - 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 }}"
+    - include_tasks: _populate.yaml
+
+    - name: Replace device configurations of listed interfaces with provided configurations
+      vyos.vyos.vyos_l3_interfaces: &replaced
+        config:
+          - name: eth1
+            ipv4:
+              - address: 192.0.2.19/24
+          - name: eth2
+            ipv6:
+              - address: 2001:db8::11/32
+        state: replaced
+      register: result
+
+    - name: Assert that correct set of commands were generated
+      assert:
+        that:
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+    - name: Assert that before dicts are correctly generated
+      assert:
+        that:
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+
+    - name: Assert that after dict is correctly generated
+      assert:
+        that:
+          - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Replace device configurations of listed interfaces with provided configurarions (IDEMPOTENT)
+      vyos.vyos.vyos_l3_interfaces: *replaced
+      register: result
+
+    - 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
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
index f908d2c..1241763 100644
--- a/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_l3_interfaces/vars/main.yaml
@@ -1,114 +1,114 @@
 ---
 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"
 
 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"
diff --git a/tests/integration/targets/vyos_lag_interfaces/meta/main.yaml b/tests/integration/targets/vyos_lag_interfaces/meta/main.yaml
index f88bce5..7413320 100644
--- a/tests/integration/targets/vyos_lag_interfaces/meta/main.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/meta/main.yaml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - prepare_vyos_tests
diff --git a/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
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 c479f79..adacb0c 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,8 +1,8 @@
 ---
 - name: Add Bond
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
-      set interfaces bonding bond0 
-      set interfaces bonding bond1 
+      set interfaces bonding bond0
+      set interfaces bonding bond1
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 1d7ee69..29085bd 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,8 +1,8 @@
 ---
 - name: Remove Bond
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
-      delete interfaces bonding bond0 
-      delete interfaces bonding bond1 
+      delete interfaces bonding bond0
+      delete interfaces bonding bond1
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 db6fb88..af6e632 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/deleted.yaml
@@ -1,46 +1,46 @@
 ---
 - debug:
     msg: "Start vyos_lag_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Delete attributes of given LAG interfaces.
-    vyos.vyos.vyos_lag_interfaces: &deleted
-      config:
-        - name: bond0
-        - name: bond1
-      state: deleted
-    register: result
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ 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 }}"
-
-  - name: Assert that the after dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Delete attributes of given interfaces (IDEMPOTENT)
-    vyos.vyos.vyos_lag_interfaces: *deleted
-    register: result
-
-  - 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 }}"
-  
+    - name: Delete attributes of given LAG interfaces.
+      vyos.vyos.vyos_lag_interfaces: &deleted
+        config:
+          - name: bond0
+          - name: bond1
+        state: deleted
+      register: result
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ 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 }}"
+
+    - name: Assert that the after dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Delete attributes of given interfaces (IDEMPOTENT)
+      vyos.vyos.vyos_lag_interfaces: *deleted
+      register: result
+
+    - 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 }}"
+
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
index c222354..74d3466 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/empty_config.yaml
@@ -1,36 +1,36 @@
 ---
 - debug:
-      msg: "START vyos_lag_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lag_interfaces empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_lag_interfaces:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
   vyos.vyos.vyos_lag_interfaces:
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
 
 - name: Overridden with empty config should give appropriate error message
   vyos.vyos.vyos_lag_interfaces:
     config:
     state: overridden
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state overridden'
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 78c9de1..7b1931f 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/merged.yaml
@@ -1,60 +1,60 @@
 ---
 - debug:
-      msg: "START vyos_lag_interfaces merged integration tests on connection={{ ansible_connection }}"
+    msg: "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:
-  - name: Merge the provided configuration with the exisiting running configuration
-    vyos.vyos.vyos_lag_interfaces: &merged
+    - name: Merge the provided configuration with the exisiting running configuration
+      vyos.vyos.vyos_lag_interfaces: &merged
         config:
-            - name: bond0
-              hash_policy: "layer2"
-              mode: "active-backup"
-              members:
-                  - member: eth1
-              primary: eth1
-
-            - name: bond1
-              hash_policy: "layer2+3"
-              mode: "active-backup"
-              members:
-                  - member: eth2
-              primary: eth2
+          - name: bond0
+            hash_policy: "layer2"
+            mode: "active-backup"
+            members:
+              - member: eth1
+            primary: eth1
+
+          - name: bond1
+            hash_policy: "layer2+3"
+            mode: "active-backup"
+            members:
+              - member: eth2
+            primary: eth2
         state: merged
-    register: result
+      register: result
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - 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:
+    - 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)
-    vyos.vyos.vyos_lag_interfaces: *merged
-    register: result
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      vyos.vyos.vyos_lag_interfaces: *merged
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - 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
+    - include_tasks: _remove_config.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 6139d9f..c44cc33 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/overridden.yaml
@@ -1,54 +1,54 @@
 ---
 - debug:
-      msg: "START vyos_lag_interfaces overridden integration tests on connection={{ ansible_connection }}"
+    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:
-  - name: Overrides all device configuration with provided configuration
-    vyos.vyos.vyos_lag_interfaces: &overridden
+    - name: Overrides all device configuration with provided configuration
+      vyos.vyos.vyos_lag_interfaces: &overridden
         config:
-            - name: bond1
-              mode: "active-backup"
-              members:
-                  - member: eth2
-              primary: eth2
-              hash_policy: layer2
+          - name: bond1
+            mode: "active-backup"
+            members:
+              - member: eth2
+            primary: eth2
+            hash_policy: layer2
         state: overridden
-    register: result
+      register: result
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - 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:
+    - 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:
+    - 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)
-    vyos.vyos.vyos_lag_interfaces: *overridden
-    register: result
+    - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
+      vyos.vyos.vyos_lag_interfaces: *overridden
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - 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
+    - include_tasks: _remove_config.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 ce469e0..894d505 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/replaced.yaml
@@ -1,51 +1,51 @@
 ---
 - debug:
-      msg: "START vyos_lag_interfaces replaced integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lag_interfaces replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Replace device configurations of listed LAG interfaces with provided configurations
-    vyos.vyos.vyos_lag_interfaces: &replaced
+    - name: Replace device configurations of listed LAG interfaces with provided configurations
+      vyos.vyos.vyos_lag_interfaces: &replaced
         config:
-            - name: bond1
-              mode: "802.3ad"
-              hash_policy: "layer2"
-              members:
-                  - member: eth2
+          - name: bond1
+            mode: "802.3ad"
+            hash_policy: "layer2"
+            members:
+              - member: eth2
         state: replaced
-    register: result
+      register: result
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - name: Assert that correct set of commands were generated
+      assert:
         that:
-            - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that before dicts are correctly generated
-    assert:
+    - name: Assert that before dicts are correctly generated
+      assert:
         that:
-            - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that after dict is correctly generated
-    assert:
+    - name: Assert that after dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Replace device configurations of listed LAG interfaces with provided configurarions (IDEMPOTENT)
-    vyos.vyos.vyos_lag_interfaces: *replaced
-    register: result
+    - name: Replace device configurations of listed LAG interfaces with provided configurarions (IDEMPOTENT)
+      vyos.vyos.vyos_lag_interfaces: *replaced
+      register: result
 
-  - name: Assert that task was idempotent
-    assert:
+    - name: Assert that task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dict is correctly generated
-    assert:
+    - name: Assert that before dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.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 eb3814e..3095a12 100644
--- a/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lag_interfaces/tests/cli/rtt.yaml
@@ -1,69 +1,69 @@
 ---
 - debug:
     msg: "START vyos_lag_interfaces round trip integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _remove_bond.yaml
 
 - block:
-  - name: Apply the provided configuration (base config)
-    vyos.vyos.vyos_lag_interfaces:
-      config:
-        - name: bond0
-          hash_policy: "layer2"
-          mode: "active-backup"
-          members:
-            - member: eth1
-          primary: eth1
+    - name: Apply the provided configuration (base config)
+      vyos.vyos.vyos_lag_interfaces:
+        config:
+          - name: bond0
+            hash_policy: "layer2"
+            mode: "active-backup"
+            members:
+              - member: eth1
+            primary: eth1
 
-        - name: bond1
-          hash_policy: "layer2+3"
-          mode: "active-backup"
-          members:
-            - member: eth2
-          primary: eth2
+          - name: bond1
+            hash_policy: "layer2+3"
+            mode: "active-backup"
+            members:
+              - member: eth2
+            primary: eth2
 
-      state: merged
-    register: base_config
+        state: merged
+      register: base_config
 
-  - name: Gather lag_interfaces facts
-    vyos.vyos.vyos_facts:
-      gather_subset:
-        - default
-      gather_network_resources:
-        - lag_interfaces
+    - name: Gather lag_interfaces facts
+      vyos.vyos.vyos_facts:
+        gather_subset:
+          - default
+        gather_network_resources:
+          - lag_interfaces
 
-  - name: Apply the provided configuration (config to be reverted)
-    vyos.vyos.vyos_lag_interfaces:
-      config:
-        - name: bond0
-          hash_policy: "layer2+3"
-          mode: "802.3ad"
-          members:
-            - member: eth1
+    - name: Apply the provided configuration (config to be reverted)
+      vyos.vyos.vyos_lag_interfaces:
+        config:
+          - name: bond0
+            hash_policy: "layer2+3"
+            mode: "802.3ad"
+            members:
+              - member: eth1
 
-        - name: bond1
-          hash_policy: "layer2"
-          mode: "xor-hash"
-          members:
-            - member: eth2
-      state: merged
-    register: result
+          - name: bond1
+            hash_policy: "layer2"
+            mode: "xor-hash"
+            members:
+              - member: eth2
+        state: merged
+      register: result
 
-  - name: Assert that changes were applied
-    assert:
-      that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
+    - name: Assert that changes were applied
+      assert:
+        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Revert back to base config using facts round trip
-    vyos.vyos.vyos_lag_interfaces:
-      config: "{{ ansible_facts['network_resources']['lag_interfaces'] }}"
-      state: overridden
-    register: revert
+    - name: Revert back to base config using facts round trip
+      vyos.vyos.vyos_lag_interfaces:
+        config: "{{ ansible_facts['network_resources']['lag_interfaces'] }}"
+        state: overridden
+      register: revert
 
-  - name: Assert that config was reverted
-    assert:
-      that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
+    - name: Assert that config was reverted
+      assert:
+        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_linkagg/tasks/main.yaml b/tests/integration/targets/vyos_linkagg/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_linkagg/tasks/main.yaml
+++ b/tests/integration/targets/vyos_linkagg/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml b/tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml
index 5a02255..fadbbd7 100644
--- a/tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_linkagg/tests/cli/basic.yaml
@@ -1,184 +1,184 @@
 ---
 - debug: msg="cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Remove linkagg
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
 
 - name: Remove linkagg
   vyos.vyos.vyos_linkagg:
     name: bond1
     state: absent
 
 - name: Create linkagg
   vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces bonding bond0 mode 802.3ad" in result.commands'
       - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
 
 - name: Create linkagg again (idempotent)
   vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Add linkagg member
   vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth2
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces ethernet eth2 bond-group bond0" in result.commands'
 
 - name: Add linkagg member again (idempotent)
   vyos.vyos.vyos_linkagg:
     name: bond0
     members:
       - eth2
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Disable linkagg
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: down
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces bonding bond0 disable" in result.commands'
 
 - name: Disable linkagg again (idempotent)
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: down
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Enable linkagg
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: up
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces bonding bond0 disable" in result.commands[0]'
 
 - name: Enable linkagg again (idempotent)
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: up
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove linkagg
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 bond-group" in result.commands'
       - '"delete interfaces ethernet eth2 bond-group" in result.commands'
       - '"delete interfaces bonding bond0" in result.commands'
 
 - name: Remove linkagg again (idempotent)
   vyos.vyos.vyos_linkagg:
     name: bond0
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Create collection of linkagg definitions
   vyos.vyos.vyos_linkagg:
     aggregate:
-        - { name: bond0, members: [eth1] }
-        - { name: bond1, members: [eth2] }
+      - {name: bond0, members: [eth1]}
+      - {name: bond1, members: [eth2]}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set interfaces bonding bond0 mode 802.3ad" in result.commands'
       - '"set interfaces ethernet eth1 bond-group bond0" in result.commands'
       - '"set interfaces bonding bond1 mode 802.3ad" in result.commands'
       - '"set interfaces ethernet eth2 bond-group bond1" in result.commands'
 
 - name: Create collection of linkagg definitions again (idempotent)
   vyos.vyos.vyos_linkagg:
     aggregate:
-        - { name: bond0, members: [eth1] }
-        - { name: bond1, members: [eth2] }
+      - {name: bond0, members: [eth1]}
+      - {name: bond1, members: [eth2]}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Remove collection of linkagg definitions
   vyos.vyos.vyos_linkagg:
     aggregate:
       - name: bond0
       - name: bond1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete interfaces ethernet eth1 bond-group" in result.commands'
       - '"delete interfaces bonding bond0" in result.commands'
       - '"delete interfaces ethernet eth2 bond-group" in result.commands'
       - '"delete interfaces bonding bond1" in result.commands'
 
 - name: Remove collection of linkagg definitions again (idempotent)
   vyos.vyos.vyos_linkagg:
     aggregate:
       - name: bond0
       - name: bond1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
diff --git a/tests/integration/targets/vyos_lldp/tasks/main.yaml b/tests/integration/targets/vyos_lldp/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_lldp/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_lldp_global/tasks/main.yaml b/tests/integration/targets/vyos_lldp_global/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_lldp_global/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
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 79660af..8017e93 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/deleted.yaml
@@ -1,44 +1,44 @@
 ---
 - debug:
     msg: "Start vyos_lldp_global deleted integration tests ansible_connection={{ ansible_connection }}"
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Delete attributes of LLDP service.
-    vyos.vyos.vyos_lldp_global: &deleted
-      config:
-      state: deleted
-    register: result
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ populate == result['before']}}"
-
-  - name: Assert that the correct set of commands were generated
-    assert:
-      that:
-        - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
-
-  - name: Assert that the after dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] == result['after']}}"
-
-  - name: Delete attributes of given interfaces (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_global: *deleted
-    register: result
-
-  - 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'] == result['before'] }}"
+    - name: Delete attributes of LLDP service.
+      vyos.vyos.vyos_lldp_global: &deleted
+        config:
+        state: deleted
+      register: result
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ populate == result['before']}}"
+
+    - name: Assert that the correct set of commands were generated
+      assert:
+        that:
+          - "{{ deleted['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+
+    - name: Assert that the after dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] == result['after']}}"
+
+    - name: Delete attributes of given interfaces (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_global: *deleted
+      register: result
+
+    - 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'] == result['before'] }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/empty_config.yaml
index 5bac638..05609b6 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/empty_config.yaml
@@ -1,25 +1,25 @@
 ---
 - debug:
-      msg: "START vyos_lldp_global empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_global empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_global:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_global:
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
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 b1687da..a17bd61 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/merged.yaml
@@ -1,49 +1,49 @@
 ---
 - debug:
-      msg: "START vyos_lldp_global merged integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_global merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Merge the provided configuration with the exisiting running configuration
-    vyos.vyos.vyos_lldp_global: &merged
+    - name: Merge the provided configuration with the exisiting running configuration
+      vyos.vyos.vyos_lldp_global: &merged
         config:
-            legacy_protocols:
-                - 'fdp'
-                - 'cdp'
-            address: 192.0.2.11
+          legacy_protocols:
+            - 'fdp'
+            - 'cdp'
+          address: 192.0.2.11
         state: merged
-    register: result
+      register: result
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that: "{{ merged['before'] == result['before'] }}"
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - 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:
+    - name: Assert that after dicts was correctly generated
+      assert:
         that:
-            - "{{ merged['after'] == result['after'] }}"
+          - "{{ merged['after'] == result['after'] }}"
 
-  - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_global: *merged
-    register: result
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_global: *merged
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that:
-            - "{{ merged['after'] == result['before'] }}"
+          - "{{ merged['after'] == result['before'] }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
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 22bd8e5..371e7f3 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/replaced.yaml
@@ -1,51 +1,51 @@
 ---
 - debug:
-      msg: "START vyos_lldp_global replaced integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_global replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Replace device configurations of LLDP service with provided configurations
-    vyos.vyos.vyos_lldp_global: &replaced
+    - name: Replace device configurations of LLDP service with provided configurations
+      vyos.vyos.vyos_lldp_global: &replaced
         config:
-            legacy_protocols:
-                - 'edp'
-                - 'sonmp'
-                - 'cdp'
-            address: 192.0.2.14
+          legacy_protocols:
+            - 'edp'
+            - 'sonmp'
+            - 'cdp'
+          address: 192.0.2.14
         state: replaced
-    register: result
+      register: result
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - name: Assert that correct set of commands were generated
+      assert:
         that:
-            - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that before dicts are correctly generated
-    assert:
+    - name: Assert that before dicts are correctly generated
+      assert:
         that:
-            - "{{ populate == result['before'] }}"
+          - "{{ populate == result['before'] }}"
 
-  - name: Assert that after dict is correctly generated
-    assert:
+    - name: Assert that after dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] == result['after'] }}"
+          - "{{ replaced['after'] == result['after'] }}"
 
-  - name: Replace device configurations of LLDP service with provided configurarions (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_global: *replaced
-    register: result
+    - name: Replace device configurations of LLDP service with provided configurarions (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_global: *replaced
+      register: result
 
-  - name: Assert that task was idempotent
-    assert:
+    - name: Assert that task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dict is correctly generated
-    assert:
+    - name: Assert that before dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] == result['before'] }}"
+          - "{{ replaced['after'] == result['before'] }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
index 4f8ca9c..02902bc 100644
--- a/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_global/tests/cli/rtt.yaml
@@ -1,51 +1,51 @@
 ---
 - debug:
     msg: "START vyos_lldp_global round trip integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Apply the provided configuration (base config)
-    vyos.vyos.vyos_lldp_global:
-      config:
-        legacy_protocols:
-          - 'fdp'
-          - 'cdp'
-        address: 192.0.2.11
-      state: merged
-    register: base_config
-
-  - name: Gather vyos_lldp_global facts
-    vyos.vyos.vyos_facts:
-      gather_subset:
-        - default
-      gather_network_resources:
-        - lldp_global
-
-  - name: Apply the provided configuration (config to be reverted)
-    vyos.vyos.vyos_lldp_global:
-      config:
-        legacy_protocols:
-          - 'edp'
-          - 'sonmp'
-          - 'cdp'
-        address: 192.0.2.14
-      state: merged
-    register: result
-
-  - name: Assert that changes were applied
-    assert:
-      that: "{{ round_trip['after'] == result['after'] }}"
-
-  - name: Revert back to base config using facts round trip
-    vyos.vyos.vyos_lldp_global:
-      config: "{{ ansible_facts['network_resources']['lldp_global'] }}"
-      state: replaced
-    register: revert
-
-  - name: Assert that config was reverted
-    assert:
-      that: "{{ base_config['after'] == revert['after'] }}"
+    - name: Apply the provided configuration (base config)
+      vyos.vyos.vyos_lldp_global:
+        config:
+          legacy_protocols:
+            - 'fdp'
+            - 'cdp'
+          address: 192.0.2.11
+        state: merged
+      register: base_config
+
+    - name: Gather vyos_lldp_global facts
+      vyos.vyos.vyos_facts:
+        gather_subset:
+          - default
+        gather_network_resources:
+          - lldp_global
+
+    - name: Apply the provided configuration (config to be reverted)
+      vyos.vyos.vyos_lldp_global:
+        config:
+          legacy_protocols:
+            - 'edp'
+            - 'sonmp'
+            - 'cdp'
+          address: 192.0.2.14
+        state: merged
+      register: result
+
+    - name: Assert that changes were applied
+      assert:
+        that: "{{ round_trip['after'] == result['after'] }}"
+
+    - name: Revert back to base config using facts round trip
+      vyos.vyos.vyos_lldp_global:
+        config: "{{ ansible_facts['network_resources']['lldp_global'] }}"
+        state: replaced
+      register: revert
+
+    - name: Assert that config was reverted
+      assert:
+        that: "{{ base_config['after'] == revert['after'] }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_global/vars/main.yaml b/tests/integration/targets/vyos_lldp_global/vars/main.yaml
index f091f2c..420b2b4 100644
--- a/tests/integration/targets/vyos_lldp_global/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_global/vars/main.yaml
@@ -1,56 +1,56 @@
 ---
 merged:
   before:
     address: '192.0.2.17'
     enable: true
     legacy_protocols:
-        - 'cdp'
+      - 'cdp'
 
   commands:
     - "set service lldp management-address '192.0.2.11'"
     - "set service lldp legacy-protocols 'fdp'"
 
   after:
     address: '192.0.2.11'
     enable: true
     legacy_protocols:
       - 'cdp'
       - 'fdp'
 
 populate:
   address: '192.0.2.17'
   enable: true
   legacy_protocols:
     - 'cdp'
 
 replaced:
   commands:
     - "set service lldp legacy-protocols 'edp'"
     - "set service lldp legacy-protocols 'sonmp'"
     - "set service lldp management-address '192.0.2.14'"
 
   after:
     address: '192.0.2.14'
     enable: true
     legacy_protocols:
       - 'cdp'
       - 'edp'
       - 'sonmp'
 
 deleted:
   commands:
     - "delete service lldp management-address"
     - "delete service lldp legacy-protocols"
 
   after:
     "enable": true
 
 round_trip:
   after:
     address: '192.0.2.14'
     enable: true
     legacy_protocols:
       - 'cdp'
       - 'edp'
       - 'fdp'
       - 'sonmp'
diff --git a/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml b/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
index e91091b..0690e9e 100644
--- a/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_lldp_interface/tests/cli/basic.yaml
@@ -1,167 +1,167 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: Make sure LLDP is not running before tests
   vyos.vyos.vyos_config:
     lines: delete service lldp
 
 - name: Create LLDP configuration
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set service lldp interface eth1" in result.commands'
 
 - name: Create LLDP configuration again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Disable LLDP configuration
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set service lldp interface eth1 disable" in result.commands'
 
 - name: Disable LLDP configuration again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: disabled
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Enable LLDP configuration
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete service lldp interface eth1 disable" in result.commands'
 
 - name: Enable LLDP configuration again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: enabled
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Delete LLDP configuration
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete service lldp interface eth1" in result.commands'
 
 - name: Delete LLDP configuration again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     name: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Create aggregate of LLDP interface configurations
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - name: eth2
+      - name: eth1
+      - name: eth2
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set service lldp interface eth1" in result.commands'
       - '"set service lldp interface eth2" in result.commands'
 
 - name: Create aggregate of LLDP interface configurations again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - name: eth2
+      - name: eth1
+      - name: eth2
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Override LLDP interface configuration on aggregate
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - { name: eth2, state: disabled }
+      - name: eth1
+      - {name: eth2, state: disabled}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set service lldp interface eth2 disable" in result.commands'
 
 - name: Override LLDP interface configuration on aggregate again (idempotent)
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - { name: eth2, state: disabled }
+      - name: eth1
+      - {name: eth2, state: disabled}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Delete aggregate of LLDP interface configurations
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - name: eth2
+      - name: eth1
+      - name: eth2
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete service lldp interface eth1" in result.commands'
       - '"delete service lldp interface eth2" in result.commands'
 
 - name: Delete aggregate of LLDP interface configurations (idempotent)
   vyos.vyos.vyos_lldp_interface:
     aggregate:
-    - name: eth1
-    - name: eth2
+      - name: eth1
+      - name: eth2
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
diff --git a/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
index f88bce5..7413320 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/meta/main.yaml
@@ -1,2 +1,3 @@
+---
 dependencies:
   - prepare_vyos_tests
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
index e3abbdb..d012f7b 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/_remove_config.yaml
@@ -1,8 +1,8 @@
 ---
 - name: Remove Config
   network.cli.cli_config:
     config: "{{ lines }}"
   vars:
     lines: |
       delete service lldp interface
-      delete service lldp 
+      delete service lldp
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 bd7c713..7b2d53a 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/deleted.yaml
@@ -1,46 +1,46 @@
 ---
 - debug:
     msg: "Start vyos_lldp_interfaces deleted integration tests ansible_connection={{ ansible_connection }}"
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Delete attributes of given LLDP interfaces.
-    vyos.vyos.vyos_lldp_interfaces: &deleted
-      config:
-        - name: 'eth1'
-        - name: 'eth2'
-      state: deleted
-    register: result
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ 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 }}"
-
-  - name: Assert that the after dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Delete attributes of given interfaces (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *deleted
-    register: result
-
-  - name: Assert that the previous task was idempotent
-    assert:
-      that:
-        - "result.changed == false"
-        - "result.commands|length == 0"
-
-  - name: Assert that the before dicts were correctly generated
-    assert:
-      that:
-        - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
+    - name: Delete attributes of given LLDP interfaces.
+      vyos.vyos.vyos_lldp_interfaces: &deleted
+        config:
+          - name: 'eth1'
+          - name: 'eth2'
+        state: deleted
+      register: result
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ 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 }}"
+
+    - name: Assert that the after dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Delete attributes of given interfaces (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *deleted
+      register: result
+
+    - name: Assert that the previous task was idempotent
+      assert:
+        that:
+          - "result.changed == false"
+          - "result.commands|length == 0"
+
+    - name: Assert that the before dicts were correctly generated
+      assert:
+        that:
+          - "{{ deleted['after'] | symmetric_difference(result['before']) |length == 0 }}"
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
index 4afb7fe..44c0b89 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/empty_config.yaml
@@ -1,36 +1,36 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces empty_config integration tests on connection={{ ansible_connection }}"
 
 - name: Merged with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: merged
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state merged'
 
 - name: Replaced with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: replaced
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state replaced'
 
 - name: Overridden with empty config should give appropriate error message
   vyos.vyos.vyos_lldp_interfaces:
     config:
     state: overridden
   register: result
-  ignore_errors: True
+  ignore_errors: true
 
 - assert:
     that:
       - result.msg == 'value of config parameter must not be empty for state overridden'
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
index ae5b10b..bf968b2 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/merged.yaml
@@ -1,58 +1,58 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces merged integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces merged integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Merge the provided configuration with the exisiting running configuration
-    vyos.vyos.vyos_lldp_interfaces: &merged
+    - name: Merge the provided configuration with the exisiting running configuration
+      vyos.vyos.vyos_lldp_interfaces: &merged
         config:
-           - name: 'eth1'
-             location:
-               civic_based: 
-                 country_code: 'US' 
-                 ca_info:
-                   - ca_type: 0 
-                     ca_value: 'ENGLISH'  
-
-           - name: 'eth2'
-             location:
-               coordinate_based: 
-                altitude: 2200 
+          - name: 'eth1'
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+          - name: 'eth2'
+            location:
+              coordinate_based:
+                altitude: 2200
                 datum: 'WGS84'
                 longitude: '222.267255W'
-                latitude: '33.524449N'      
+                latitude: '33.524449N'
         state: merged
-    register: result
+      register: result
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Assert that before dicts were correctly generated
+      assert:
         that: "{{ merged['before'] | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - 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:
+    - 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)
-    vyos.vyos.vyos_lldp_interfaces: *merged
-    register: result
+    - name: Merge the provided configuration with the existing running configuration (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *merged
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - 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
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
index eedb563..8cf038c 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/overridden.yaml
@@ -1,49 +1,49 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces overridden integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces overridden integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate_intf.yaml
 
 - block:
-  - name: Overrides all device configuration with provided configuration
-    vyos.vyos.vyos_lldp_interfaces: &overridden
-       config:
-        - name: 'eth2'
-          location:
-            elin: '0000000911'
-       state: overridden
-    register: result
-
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - name: Overrides all device configuration with provided configuration
+      vyos.vyos.vyos_lldp_interfaces: &overridden
+        config:
+          - name: 'eth2'
+            location:
+              elin: '0000000911'
+        state: overridden
+      register: result
+
+    - name: Assert that before dicts were correctly generated
+      assert:
         that:
-            - "{{ populate_intf | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ populate_intf | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that correct commands were generated
-    assert:
+    - 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:
+    - 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)
-    vyos.vyos.vyos_lldp_interfaces: *overridden
-    register: result
+    - name: Overrides all device configuration with provided configurations (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *overridden
+      register: result
 
-  - name: Assert that the previous task was idempotent
-    assert:
+    - name: Assert that the previous task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dicts were correctly generated
-    assert:
+    - 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
+    - include_tasks: _remove_config.yaml
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 07fec9e..17acf06 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/replaced.yaml
@@ -1,63 +1,63 @@
 ---
 - debug:
-      msg: "START vyos_lldp_interfaces replaced integration tests on connection={{ ansible_connection }}"
+    msg: "START vyos_lldp_interfaces replaced integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - include_tasks: _populate.yaml
 
 - block:
-  - name: Replace device configurations of listed LLDP interfaces with provided configurations
-    vyos.vyos.vyos_lldp_interfaces: &replaced
+    - name: Replace device configurations of listed LLDP interfaces with provided configurations
+      vyos.vyos.vyos_lldp_interfaces: &replaced
         config:
-           - name: 'eth2'
-             enable: false
-             location:
-               civic_based: 
-                 country_code: 'US' 
-                 ca_info:
-                   - ca_type: 0 
-                     ca_value: 'ENGLISH'
-
-           - name: 'eth1'
-             enable: false
-             location:
-               coordinate_based: 
-                altitude: 2200 
+          - name: 'eth2'
+            enable: false
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+          - name: 'eth1'
+            enable: false
+            location:
+              coordinate_based:
+                altitude: 2200
                 datum: 'WGS84'
                 longitude: '222.267255W'
                 latitude: '33.524449N'
         state: replaced
-    register: result
+      register: result
 
-  - name: Assert that correct set of commands were generated
-    assert:
+    - name: Assert that correct set of commands were generated
+      assert:
         that:
-            - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
+          - "{{ replaced['commands'] | symmetric_difference(result['commands']) |length == 0 }}"
 
-  - name: Assert that before dicts are correctly generated
-    assert:
+    - name: Assert that before dicts are correctly generated
+      assert:
         that:
-            - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ populate | symmetric_difference(result['before']) |length == 0 }}"
 
-  - name: Assert that after dict is correctly generated
-    assert:
+    - name: Assert that after dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['after']) |length == 0 }}"
 
-  - name: Replace device configurations of listed LLDP interfaces with provided configurarions (IDEMPOTENT)
-    vyos.vyos.vyos_lldp_interfaces: *replaced
-    register: result
+    - name: Replace device configurations of listed LLDP interfaces with provided configurarions (IDEMPOTENT)
+      vyos.vyos.vyos_lldp_interfaces: *replaced
+      register: result
 
-  - name: Assert that task was idempotent
-    assert:
+    - name: Assert that task was idempotent
+      assert:
         that:
-            - "result['changed'] == false"
+          - "result['changed'] == false"
 
-  - name: Assert that before dict is correctly generated
-    assert:
+    - name: Assert that before dict is correctly generated
+      assert:
         that:
-            - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
+          - "{{ replaced['after'] | symmetric_difference(result['before']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
index d97cf9c..4d4cf82 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/tests/cli/rtt.yaml
@@ -1,57 +1,57 @@
 ---
 - debug:
     msg: "START vyos_lldp_interfaces round trip integration tests on connection={{ ansible_connection }}"
 
 - include_tasks: _remove_config.yaml
 
 - block:
-  - name: Apply the provided configuration (base config)
-    vyos.vyos.vyos_lldp_interfaces:
-      config:
-        - name: 'eth1'
-          location:
-            civic_based: 
-              country_code: 'US' 
-              ca_info:
-                - ca_type: 0 
-                  ca_value: 'ENGLISH'
-
-      state: merged
-    register: base_config
-
-  - name: Gather lldp_interfaces facts
-    vyos.vyos.vyos_facts:
-      gather_subset:
-        - default
-      gather_network_resources:
-        - lldp_interfaces
-
-  - name: Apply the provided configuration (config to be reverted)
-    vyos.vyos.vyos_lldp_interfaces:
-      config:
-        - name: 'eth2'
-          location:
-            coordinate_based: 
-             altitude: 2200 
-             datum: 'WGS84'
-             longitude: '222.267255W'
-             latitude: '33.524449N'        
-      state: merged
-    register: result
-
-  - name: Assert that changes were applied
-    assert:
-      that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
-
-  - name: Revert back to base config using facts round trip
-    vyos.vyos.vyos_lldp_interfaces:
-      config: "{{ ansible_facts['network_resources']['lldp_interfaces'] }}"
-      state: overridden
-    register: revert
-
-  - name: Assert that config was reverted
-    assert:
-      that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
+    - name: Apply the provided configuration (base config)
+      vyos.vyos.vyos_lldp_interfaces:
+        config:
+          - name: 'eth1'
+            location:
+              civic_based:
+                country_code: 'US'
+                ca_info:
+                  - ca_type: 0
+                    ca_value: 'ENGLISH'
+
+        state: merged
+      register: base_config
+
+    - name: Gather lldp_interfaces facts
+      vyos.vyos.vyos_facts:
+        gather_subset:
+          - default
+        gather_network_resources:
+          - lldp_interfaces
+
+    - name: Apply the provided configuration (config to be reverted)
+      vyos.vyos.vyos_lldp_interfaces:
+        config:
+          - name: 'eth2'
+            location:
+              coordinate_based:
+                altitude: 2200
+                datum: 'WGS84'
+                longitude: '222.267255W'
+                latitude: '33.524449N'
+        state: merged
+      register: result
+
+    - name: Assert that changes were applied
+      assert:
+        that: "{{ round_trip['after'] | symmetric_difference(result['after']) |length == 0 }}"
+
+    - name: Revert back to base config using facts round trip
+      vyos.vyos.vyos_lldp_interfaces:
+        config: "{{ ansible_facts['network_resources']['lldp_interfaces'] }}"
+        state: overridden
+      register: revert
+
+    - name: Assert that config was reverted
+      assert:
+        that: "{{ base_config['after'] | symmetric_difference(revert['after']) |length == 0 }}"
 
   always:
-  - include_tasks: _remove_config.yaml
+    - include_tasks: _remove_config.yaml
diff --git a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
index 6f33343..169b0d5 100644
--- a/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
+++ b/tests/integration/targets/vyos_lldp_interfaces/vars/main.yaml
@@ -1,130 +1,130 @@
 ---
 merged:
   before: []
 
 
   commands:
     - "set service lldp interface eth1 location civic-based country-code 'US'"
     - "set service lldp interface eth1 location civic-based ca-type 0 ca-value 'ENGLISH'"
     - "set service lldp interface eth1"
     - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
     - "set service lldp interface eth2 location coordinate-based altitude '2200'"
     - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
     - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
     - "set service lldp interface eth2 location coordinate-based latitude '33.524449N'"
     - "set service lldp interface eth2 location coordinate-based altitude '2200'"
     - "set service lldp interface eth2 location coordinate-based datum 'WGS84'"
     - "set service lldp interface eth2 location coordinate-based longitude '222.267255W'"
     - "set service lldp interface eth2"
 
   after:
     - name: 'eth1'
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
-              ca_value: 'ENGLISH'  
+            - ca_type: 0
+              ca_value: 'ENGLISH'
 
     - name: 'eth2'
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'  
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'
 
 populate:
   - name: 'eth1'
     location:
-      civic_based: 
-        country_code: 'US' 
+      civic_based:
+        country_code: 'US'
         ca_info:
-          - ca_type: 0 
-            ca_value: 'ENGLISH'  
+          - ca_type: 0
+            ca_value: 'ENGLISH'
 
   - name: 'eth2'
     location:
-      coordinate_based: 
-       altitude: 2200 
-       datum: 'WGS84'
-       longitude: '222.267255W'
-       latitude: '33.524449N'  
+      coordinate_based:
+        altitude: 2200
+        datum: 'WGS84'
+        longitude: '222.267255W'
+        latitude: '33.524449N'
 
 replaced:
   commands:
     - "delete service lldp interface eth2 location"
     - "set service lldp interface eth2 'disable'"
     - "set service lldp interface eth2 location civic-based country-code 'US'"
     - "set service lldp interface eth2 location civic-based ca-type 0 ca-value 'ENGLISH'"
     - "delete service lldp interface eth1 location"
     - "set service lldp interface eth1 'disable'"
     - "set service lldp interface eth1 location coordinate-based latitude '33.524449N'"
     - "set service lldp interface eth1 location coordinate-based altitude '2200'"
     - "set service lldp interface eth1 location coordinate-based datum 'WGS84'"
     - "set service lldp interface eth1 location coordinate-based longitude '222.267255W'"
 
   after:
     - name: 'eth2'
       enable: false
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
-              ca_value: 'ENGLISH'  
+            - ca_type: 0
+              ca_value: 'ENGLISH'
 
     - name: 'eth1'
       enable: false
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'  
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'
 
 populate_intf:
   - name: 'eth2'
     enable: false
     location:
-      civic_based: 
-        country_code: 'US' 
+      civic_based:
+        country_code: 'US'
         ca_info:
-          - ca_type: 0 
-            ca_value: 'ENGLISH'  
+          - ca_type: 0
+            ca_value: 'ENGLISH'
 
 overridden:
   commands:
-    - "delete service lldp interface eth2 location" 
-    - "delete service lldp interface eth2 'disable'" 
+    - "delete service lldp interface eth2 location"
+    - "delete service lldp interface eth2 'disable'"
     - "set service lldp interface eth2 location elin '0000000911'"
 
   after:
     - name: 'eth2'
       location:
         elin: 0000000911
 
 deleted:
   commands:
     - "delete service lldp interface eth1"
     - "delete service lldp interface eth2"
 
   after: []
 
 round_trip:
   after:
     - name: 'eth1'
       location:
-        civic_based: 
-          country_code: 'US' 
+        civic_based:
+          country_code: 'US'
           ca_info:
-            - ca_type: 0 
+            - ca_type: 0
               ca_value: 'ENGLISH'
 
     - name: 'eth2'
       location:
-        coordinate_based: 
-         altitude: 2200 
-         datum: 'WGS84'
-         longitude: '222.267255W'
-         latitude: '33.524449N'
+        coordinate_based:
+          altitude: 2200
+          datum: 'WGS84'
+          longitude: '222.267255W'
+          latitude: '33.524449N'
diff --git a/tests/integration/targets/vyos_logging/tasks/main.yaml b/tests/integration/targets/vyos_logging/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_logging/tasks/main.yaml
+++ b/tests/integration/targets/vyos_logging/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_logging/tests/cli/basic.yaml b/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
index 144f8d3..d588456 100644
--- a/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_logging/tests/cli/basic.yaml
@@ -1,126 +1,126 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: set-up logging
   vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set system syslog console facility all level info" in result.commands'
 
 - name: set-up logging again (idempotent)
   vyos.vyos.vyos_logging:
     dest: console
     facility: all
     level: info
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: file logging
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set system syslog file test facility all level notice" in result.commands'
 
 - name: file logging again (idempotent)
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: delete logging
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete system syslog file test facility all level notice" in result.commands'
 
 - name: delete logging again (idempotent)
   vyos.vyos.vyos_logging:
     dest: file
     name: test
     facility: all
     level: notice
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Add logging collections
   vyos.vyos.vyos_logging:
     aggregate:
-      - { dest: file, name: test1, facility: all, level: info }
-      - { dest: file, name: test2, facility: news, level: debug }
+      - {dest: file, name: test1, facility: all, level: info}
+      - {dest: file, name: test2, facility: news, level: debug}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set system syslog file test1 facility all level info" in result.commands'
       - '"set system syslog file test2 facility news level debug" in result.commands'
 
 - name: Add and remove logging collections with overrides
   vyos.vyos.vyos_logging:
     aggregate:
-      - { dest: console, facility: all, level: info }
-      - { dest: file, name: test1, facility: all, level: info, state: absent }
-      - { dest: console, facility: daemon, level: warning }
+      - {dest: console, facility: all, level: info}
+      - {dest: file, name: test1, facility: all, level: info, state: absent}
+      - {dest: console, facility: daemon, level: warning}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete system syslog file test1 facility all level info" in result.commands'
       - '"set system syslog console facility daemon level warning" in result.commands'
 
 - name: Remove logging collections
   vyos.vyos.vyos_logging:
     aggregate:
-      - { dest: console, facility: all, level: info }
-      - { dest: console, facility: daemon, level: warning }
-      - { dest: file, name: test2, facility: news, level: debug }
+      - {dest: console, facility: all, level: info}
+      - {dest: console, facility: daemon, level: warning}
+      - {dest: file, name: test2, facility: news, level: debug}
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete system syslog console facility all level info" in result.commands'
       - '"delete system syslog console facility daemon level warning" in result.commands'
       - '"delete system syslog file test2 facility news level debug" in result.commands'
diff --git a/tests/integration/targets/vyos_smoke/tasks/main.yaml b/tests/integration/targets/vyos_smoke/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_smoke/tasks/main.yaml
+++ b/tests/integration/targets/vyos_smoke/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml b/tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml
index 1c07980..cfac254 100644
--- a/tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml
+++ b/tests/integration/targets/vyos_smoke/tests/cli/common_config.yaml
@@ -1,10 +1,11 @@
+---
 # vyos.py in plugins and module_utils/network covered by these as well
 # hit NetworkConfig
 - name: configure simple config command
   vyos.vyos.vyos_config:
     lines: set system host-name smoke
 
 - name: return host name to inventory_hostname
   vyos.vyos.vyos_config:
     lines: set system host-name {{ inventory_hostname_short }}
     match: none
diff --git a/tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml b/tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
index db837c5..fb80c93 100644
--- a/tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
+++ b/tests/integration/targets/vyos_smoke/tests/cli/common_utils.yaml
@@ -1,49 +1,50 @@
+---
 # vyos.py in plugins and module_utils/network covered by these as well
 # remove_default_spec() hit by multiple plays
 
 # hit ComplexList
 - name: get output for single command
   vyos.vyos.vyos_command:
     commands:
       - show version
   register: result
 
 - assert:
     that:
       - result.changed == false
       - result.stdout is defined
       - result.stdout_lines is defined
 
 # hit conditional() - used for declarative intent
 # Note, this can't be run on AWS because fully testing the vyos_interface dependencies
 # requires the ability to create and remove interfaces other than eth0
 - name: enable eth1
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: True
+    enabled: true
     state: present
   register: result
 
 - name: Check intent arguments
   vyos.vyos.vyos_interface:
     name: eth1
     state: up
   register: result
 
 - name: Check intent arguments (failed condition)
   vyos.vyos.vyos_interface:
     name: eth1
     state: down
-  ignore_errors: yes
+  ignore_errors: true
   register: result
 
 - assert:
     that:
       - "result.failed == true"
       - "'state eq(down)' in result.failed_conditions"
 
 - name: Config + intent
   vyos.vyos.vyos_interface:
     name: eth1
-    enabled: False
+    enabled: false
     state: down
diff --git a/tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml b/tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
index 720f95e..456effc 100644
--- a/tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
+++ b/tests/integration/targets/vyos_smoke/tests/cli/misc_tests.yaml
@@ -1,13 +1,14 @@
+---
 # hit check conditional in module_utils.network.vyos -> load_config()
 - name: configure simple config command
   vyos.vyos.vyos_config:
     lines: set system host-name check-test
-  check_mode: yes
+  check_mode: true
 
 - name: get host name
   vyos.vyos.vyos_command:
     commands: show host name
   register: result
 
 - assert:
     that: '"check-test" not in result.stdout'
diff --git a/tests/integration/targets/vyos_static_route/tasks/main.yaml b/tests/integration/targets/vyos_static_route/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_static_route/tasks/main.yaml
+++ b/tests/integration/targets/vyos_static_route/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml b/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
index 122e49a..4b1ef1c 100644
--- a/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_static_route/tests/cli/basic.yaml
@@ -1,120 +1,120 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: create static route
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: create static route again (idempotent)
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: modify admin distance of static route
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set protocols static route 172.24.0.0/24 next-hop 192.168.42.64 distance 1" in result.commands'
 
 - name: modify admin distance of static route again (idempotent)
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0
     mask: 24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: delete static route
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete protocols static route 172.24.0.0/24" in result.commands'
 
 - name: delete static route again (idempotent)
   vyos.vyos.vyos_static_route:
     prefix: 172.24.0.0/24
     next_hop: 192.168.42.64
     admin_distance: 1
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == false'
 
 - name: Add static route collections
   vyos.vyos.vyos_static_route:
     aggregate:
-      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
-      - { prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64 }
+      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
+      - {prefix: 172.24.2.0, mask: 24, next_hop: 192.168.42.64}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"set protocols static route 172.24.1.0/24 next-hop 192.168.42.64" in result.commands'
       - '"set protocols static route 172.24.2.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Add and remove static route collections with overrides
   vyos.vyos.vyos_static_route:
     aggregate:
-      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
-      - { prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent }
-      - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
+      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
+      - {prefix: 172.24.2.0/24, next_hop: 192.168.42.64, state: absent}
+      - {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
     state: present
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete protocols static route 172.24.2.0/24" in result.commands'
       - '"set protocols static route 172.24.3.0/24 next-hop 192.168.42.64" in result.commands'
 
 - name: Remove static route collections
   vyos.vyos.vyos_static_route:
     aggregate:
-      - { prefix: 172.24.1.0/24, next_hop: 192.168.42.64 }
-      - { prefix: 172.24.3.0/24, next_hop: 192.168.42.64 }
+      - {prefix: 172.24.1.0/24, next_hop: 192.168.42.64}
+      - {prefix: 172.24.3.0/24, next_hop: 192.168.42.64}
     state: absent
   register: result
 
 - assert:
     that:
       - 'result.changed == true'
       - '"delete protocols static route 172.24.1.0/24" in result.commands'
       - '"delete protocols static route 172.24.3.0/24" in result.commands'
diff --git a/tests/integration/targets/vyos_system/tasks/main.yaml b/tests/integration/targets/vyos_system/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_system/tasks/main.yaml
+++ b/tests/integration/targets/vyos_system/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_user/tasks/main.yaml b/tests/integration/targets/vyos_user/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_user/tasks/main.yaml
+++ b/tests/integration/targets/vyos_user/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_user/tests/cli/auth.yaml b/tests/integration/targets/vyos_user/tests/cli/auth.yaml
index 566191e..bbd67bc 100644
--- a/tests/integration/targets/vyos_user/tests/cli/auth.yaml
+++ b/tests/integration/targets/vyos_user/tests/cli/auth.yaml
@@ -1,34 +1,34 @@
 ---
 - block:
   - name: Create user with password
     vyos.vyos.vyos_user:
       name: auth_user
       role: admin
       state: present
       configured_password: pass123
 
   - name: test login via ssh with new user
     expect:
       command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_port | default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper show version'"
       responses:
         (?i)password: "pass123"
 
   - name: test login via ssh with invalid password (should fail)
     expect:
       command: "ssh auth_user@{{ ansible_ssh_host }} -p {{ ansible_port | default(22) }} -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no '/opt/vyatta/sbin/vyatta-cfg-cmd-wrapper show version'"
       responses:
         (?i)password: "badpass"
-    ignore_errors: yes
+    ignore_errors: true
     register: results
 
   - name: check that attempt failed
     assert:
       that:
         - results.failed
 
   always:
-  - name: delete user
-    vyos.vyos.vyos_user:
-      name: auth_user
-      state: absent
-    register: result
+    - name: delete user
+      vyos.vyos.vyos_user:
+        name: auth_user
+        state: absent
+      register: result
diff --git a/tests/integration/targets/vyos_vlan/tasks/main.yaml b/tests/integration/targets/vyos_vlan/tasks/main.yaml
index 415c99d..d4cf26f 100644
--- a/tests/integration/targets/vyos_vlan/tasks/main.yaml
+++ b/tests/integration/targets/vyos_vlan/tasks/main.yaml
@@ -1,2 +1,2 @@
 ---
-- { include: cli.yaml, tags: ['cli'] }
+- {include: cli.yaml, tags: ['cli']}
diff --git a/tests/integration/targets/vyos_vlan/tests/cli/basic.yaml b/tests/integration/targets/vyos_vlan/tests/cli/basic.yaml
index 6e4417e..cb0f348 100644
--- a/tests/integration/targets/vyos_vlan/tests/cli/basic.yaml
+++ b/tests/integration/targets/vyos_vlan/tests/cli/basic.yaml
@@ -1,101 +1,101 @@
 ---
 - debug: msg="START cli/basic.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove vlan used in test
   vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 5
       - delete interfaces ethernet eth0 vif 100
       - delete interfaces ethernet eth0 vif 101
       - delete interfaces ethernet eth1 vif 201
 
 - name: set vlan with name
   vyos.vyos.vyos_vlan: &name
     vlan_id: 100
     name: vlan-100
     interfaces: eth1
   register: result
 
 - assert:
     that:
       - "result.changed == true"
       - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
 
 - name: set vlan with name(idempotence)
   vyos.vyos.vyos_vlan: *name
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
 - name: set vlan with address
   vyos.vyos.vyos_vlan: &address
     vlan_id: 5
     address: 192.168.5.12/24
     interfaces: eth0
   register: result
 
 - assert:
     that:
       - "result.changed == true"
       - "'set interfaces ethernet eth0 vif 5 address 192.168.5.12/24' in result.commands"
 
 - name: set vlan with address(idempotence)
   vyos.vyos.vyos_vlan: *address
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
 - name: delete
   vyos.vyos.vyos_vlan: &delete
     vlan_id: 100
     interfaces: eth1
     state: absent
   register: result
 
 - assert:
     that:
       - "result.changed == true"
       - "'delete interfaces ethernet eth1 vif 100' in result.commands"
 
 - name: delete(idempotence)
   vyos.vyos.vyos_vlan: *delete
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
 - name: Create VLANs using aggregate
   vyos.vyos.vyos_vlan: &agg_vlan
     aggregate:
-      - { vlan_id: 101, name: voice, interfaces: "eth0" }
-      - { vlan_id: 201, name: mgm, interfaces: "eth1" }
+      - {vlan_id: 101, name: voice, interfaces: "eth0"}
+      - {vlan_id: 201, name: mgm, interfaces: "eth1"}
     state: present
   register: result
 
 - assert:
     that:
       - "result.changed == true"
       - "'set interfaces ethernet eth0 vif 101 description voice' in result.commands"
       - "'set interfaces ethernet eth1 vif 201 description mgm' in result.commands"
 
 - name: Create VLANs using aggregate (idempotent)
   vyos.vyos.vyos_vlan: *agg_vlan
   register: result
 
 - assert:
     that:
       - "result.changed == false"
 
 - name: teardown
   vyos.vyos.vyos_config:
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 5
       - delete interfaces ethernet eth0 vif 101
       - delete interfaces ethernet eth1 vif 201
diff --git a/tests/integration/targets/vyos_vlan/tests/cli/intent.yaml b/tests/integration/targets/vyos_vlan/tests/cli/intent.yaml
index 7c78937..4a12317 100644
--- a/tests/integration/targets/vyos_vlan/tests/cli/intent.yaml
+++ b/tests/integration/targets/vyos_vlan/tests/cli/intent.yaml
@@ -1,59 +1,59 @@
 ---
 - debug: msg="START cli/intent.yaml on connection={{ ansible_connection }}"
 
 - name: setup - remove vlan used in test
   vyos.vyos.vyos_config: &delete
     lines:
       - delete interfaces ethernet eth1 vif 100
       - delete interfaces ethernet eth0 vif 100
 
 - name: set vlan with name
   vyos.vyos.vyos_vlan:
     vlan_id: 100
     name: vlan-100
     interfaces: eth1
   register: result
 
 - assert:
     that:
       - "result.changed == true"
       - "'set interfaces ethernet eth1 vif 100 description vlan-100' in result.commands"
 
 - name: check vlan interface intent
   vyos.vyos.vyos_vlan:
     vlan_id: 100
     name: vlan-100
     associated_interfaces: eth1
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
 - name: vlan interface config + intent
   vyos.vyos.vyos_vlan:
     vlan_id: 100
     interfaces: eth0
     associated_interfaces:
-    - eth0
-    - eth1
+      - eth0
+      - eth1
   register: result
 
 - assert:
     that:
       - "result.failed == false"
 
 - name: vlan intent fail
   vyos.vyos.vyos_vlan:
     vlan_id: 100
     associated_interfaces:
-    - eth3
-    - eth4
+      - eth3
+      - eth4
   register: result
-  ignore_errors: yes
+  ignore_errors: true
 
 - assert:
     that:
       - "result.failed == True"
 
 - debug: msg="End cli/intent.yaml on connection={{ ansible_connection }}"