From 0e834fc9e4ace93a5e47647fb3544d775977d90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Verg=C3=A9?= <adrienverge@gmail.com>
Date: Mon, 18 Apr 2016 16:47:38 +0200
Subject: [PATCH] Fix cosmetic problems in YAML source

This change corrects problems reported by the `yamllint` linter.

Since key duplication problems were removed in 4d48711, this commit
mainly fixes trailing spaces and extra empty lines at beginning/end of
files.
---
 test/integration/cloudflare.yml               | 12 ++---
 test/integration/galaxy_roles.yml             |  1 -
 test/integration/integration_config.yml       |  1 -
 .../roles/test_azure/tasks/main.yml           |  1 -
 .../test_cloudflare_dns/tasks/ns_record.yml   |  4 +-
 .../roles/test_consul_kv/tasks/main.yml       |  4 +-
 .../roles/test_consul_service/tasks/main.yml  |  2 +-
 .../roles/test_consul_session/tasks/main.yml  |  1 -
 .../tasks/present.yml                         |  2 +-
 .../roles/test_cs_sshkeypair/tasks/main.yml   |  4 +-
 .../roles/test_ec2_asg/tasks/main.yml         |  8 ++--
 .../roles/test_ec2_elb/tasks/main.yml         |  1 -
 .../roles/test_ec2_elb_lb/tasks/main.yml      |  1 -
 .../roles/test_ec2_group/defaults/main.yml    |  1 -
 .../roles/test_gce_pd/tasks/main.yml          |  1 -
 .../roles/test_gce_tag/defaults/main.yml      |  1 -
 .../roles/test_rax_cbs/tasks/main.yml         |  1 -
 .../test_rax_scaling_group/tasks/main.yml     | 19 --------
 .../targets/apache2_module/meta/main.yml      |  3 +-
 .../targets/apt_repository/tasks/cleanup.yml  |  1 -
 .../targets/apt_repository/tasks/main.yml     |  1 -
 .../targets/asa_acl/tasks/main.yaml           |  1 -
 .../targets/asa_command/tasks/cli.yaml        |  2 -
 .../targets/asa_command/tasks/main.yaml       |  1 -
 .../targets/asa_config/tasks/cli.yaml         |  2 -
 .../targets/asa_config/tasks/main.yaml        |  1 -
 .../targets/assemble/tasks/main.yml           |  1 -
 test/integration/targets/async/meta/main.yml  |  3 +-
 test/integration/targets/async/tasks/main.yml |  2 +-
 .../targets/authorized_key/meta/main.yml      |  2 +-
 .../integration/targets/become/tasks/main.yml |  1 -
 test/integration/targets/binary/meta/main.yml |  3 +-
 .../roles/test_binary_modules/tasks/main.yml  |  1 -
 .../binary_modules/test_binary_modules.yml    |  1 -
 .../targets/changed_when/meta/main.yml        |  3 +-
 .../targets/changed_when/tasks/main.yml       |  6 +--
 .../roles/test_always_run/meta/main.yml       |  1 -
 .../targets/command_shell/meta/main.yml       |  3 +-
 .../targets/conditionals/tasks/main.yml       |  2 +-
 test/integration/targets/copy/meta/main.yml   |  3 +-
 .../targets/dellos10_command/tasks/cli.yaml   |  2 -
 .../targets/dellos10_command/tasks/main.yaml  |  1 -
 .../targets/dellos10_config/tasks/cli.yaml    |  2 -
 .../targets/dellos10_config/tasks/main.yaml   |  1 -
 .../targets/dellos10_facts/tasks/cli.yaml     |  2 -
 .../targets/dellos10_facts/tasks/main.yaml    |  1 -
 .../targets/dellos6_command/tasks/cli.yaml    |  2 -
 .../targets/dellos6_command/tasks/main.yaml   |  1 -
 .../targets/dellos6_config/tasks/cli.yaml     |  2 -
 .../targets/dellos6_config/tasks/main.yaml    |  1 -
 .../targets/dellos6_facts/tasks/cli.yaml      |  2 -
 .../targets/dellos6_facts/tasks/main.yaml     |  1 -
 .../targets/dellos9_command/tasks/cli.yaml    |  2 -
 .../targets/dellos9_command/tasks/main.yaml   |  1 -
 .../targets/dellos9_config/tasks/cli.yaml     |  2 -
 .../targets/dellos9_config/tasks/main.yaml    |  1 -
 .../targets/dellos9_facts/tasks/cli.yaml      |  2 -
 .../targets/dellos9_facts/tasks/main.yaml     |  1 -
 test/integration/targets/dnf/tasks/main.yml   |  1 -
 .../docker/tasks/docker-setup-debian.yml      |  1 -
 .../integration/targets/docker/tasks/main.yml |  1 -
 .../targets/docker/tasks/registry-tests.yml   |  5 +-
 .../targets/eos_command/tasks/cli.yaml        |  2 -
 .../targets/eos_command/tasks/eapi.yaml       |  2 -
 .../targets/eos_command/tasks/main.yaml       |  1 -
 .../targets/eos_config/tasks/cli.yaml         |  2 -
 .../targets/eos_config/tasks/eapi.yaml        |  2 -
 .../targets/eos_config/tasks/main.yaml        |  1 -
 .../targets/eos_eapi/defaults/main.yaml       |  1 -
 .../targets/eos_eapi/tasks/cli.yaml           |  2 -
 .../targets/eos_facts/tasks/cli.yaml          |  2 -
 .../targets/eos_facts/tasks/eapi.yaml         |  2 -
 .../targets/eos_facts/tasks/main.yaml         |  1 -
 .../targets/eos_template/tasks/cli.yaml       |  2 -
 .../targets/eos_template/tasks/eapi.yaml      |  2 -
 .../targets/eos_template/tasks/main.yaml      |  1 -
 .../integration/targets/facts_d/meta/main.yml |  3 +-
 .../targets/facts_d/tasks/main.yml            |  6 +--
 .../targets/failed_when/tasks/main.yml        |  1 -
 test/integration/targets/fetch/meta/main.yml  |  3 +-
 test/integration/targets/fetch/tasks/main.yml |  1 -
 test/integration/targets/file/meta/main.yml   |  3 +-
 test/integration/targets/file/tasks/main.yml  |  2 +-
 .../targets/file/tasks/selinux_tests.yml      |  2 +-
 .../integration/targets/filters/meta/main.yml |  3 +-
 .../targets/filters/tasks/main.yml            |  1 -
 .../gathering_facts/test_gathering_facts.yml  |  1 -
 test/integration/targets/gem/meta/main.yml    |  3 +-
 test/integration/targets/gem/tasks/main.yml   | 13 +++--
 .../integration/targets/get_url/meta/main.yml |  1 -
 .../targets/get_url/tasks/main.yml            | 14 +++---
 test/integration/targets/git/meta/main.yml    |  3 +-
 .../test_force_handlers/handlers/main.yml     |  2 +-
 .../roles/test_force_handlers/tasks/main.yml  |  4 +-
 .../roles/test_handlers/handlers/main.yml     |  2 +-
 .../roles/test_handlers/meta/main.yml         |  1 -
 .../roles/test_handlers/tasks/main.yml        |  2 +-
 .../test_handlers_meta/handlers/main.yml      |  2 +-
 .../roles/test_handlers_meta/tasks/main.yml   |  7 ++-
 .../targets/handlers/test_handlers.yml        |  2 +-
 .../roles/test_hash_behavior/meta/main.yml    |  1 -
 .../roles/test_hash_behavior/tasks/main.yml   |  5 +-
 test/integration/targets/hg/meta/main.yml     |  3 +-
 test/integration/targets/hg/tasks/main.yml    |  6 +--
 .../targets/ignore_errors/meta/main.yml       |  3 +-
 .../targets/ignore_errors/tasks/main.yml      |  1 -
 .../roles/test_includes/handlers/main.yml     |  1 -
 .../test_includes/handlers/more_handlers.yml  |  2 -
 .../test_includes/tasks/included_task1.yml    |  5 +-
 .../roles/test_includes/tasks/main.yml        |  6 +--
 .../targets/includes/test_includes2.yml       |  5 +-
 .../targets/ios_command/tasks/cli.yaml        |  2 -
 .../targets/ios_command/tasks/main.yaml       |  1 -
 .../targets/ios_config/tasks/cli.yaml         |  2 -
 .../targets/ios_config/tasks/main.yaml        |  1 -
 .../targets/ios_facts/tasks/cli.yaml          |  2 -
 .../targets/ios_facts/tasks/main.yaml         |  1 -
 .../targets/ios_template/tasks/cli.yaml       |  2 -
 .../targets/ios_template/tasks/main.yaml      |  1 -
 .../targets/iosxr_command/tasks/cli.yaml      |  2 -
 .../targets/iosxr_command/tasks/main.yaml     |  1 -
 .../targets/iosxr_config/tasks/cli.yaml       |  2 -
 .../targets/iosxr_config/tasks/main.yaml      |  1 -
 .../targets/iosxr_facts/tasks/cli.yaml        |  2 -
 .../targets/iosxr_facts/tasks/main.yaml       |  1 -
 .../targets/iosxr_template/tasks/cli.yaml     |  2 -
 .../targets/iosxr_template/tasks/main.yaml    |  1 -
 .../targets/iterators/meta/main.yml           |  3 +-
 .../targets/iterators/tasks/main.yml          |  2 -
 .../targets/junos_command/tasks/main.yaml     |  1 -
 .../junos_command/tasks/netconf_text.yaml     |  2 -
 .../junos_command/tasks/netconf_xml.yaml      |  2 -
 .../targets/junos_config/defaults/main.yaml   |  1 -
 .../targets/junos_config/tasks/main.yaml      |  1 -
 .../targets/junos_config/tasks/netconf.yaml   |  2 -
 .../targets/junos_netconf/tasks/cli.yaml      |  2 -
 .../targets/junos_netconf/tasks/main.yaml     |  1 -
 .../targets/junos_template/defaults/main.yaml |  1 -
 .../targets/junos_template/tasks/main.yaml    |  1 -
 .../targets/junos_template/tasks/netconf.yaml |  2 -
 .../targets/lookup_paths/testplay.yml         |  1 -
 .../integration/targets/lookups/meta/main.yml |  1 -
 .../targets/lookups/tasks/main.yml            | 10 ++--
 .../targets/mysql_db/defaults/main.yml        |  1 -
 .../targets/mysql_db/tasks/main.yml           | 48 ++++++++-----------
 .../mysql_db/tasks/state_dump_import.yml      | 12 ++---
 .../targets/mysql_user/defaults/main.yml      |  3 +-
 .../mysql_user/tasks/assert_no_user.yml       |  6 +--
 .../targets/mysql_user/tasks/assert_user.yml  |  8 ++--
 .../targets/mysql_user/tasks/create_user.yml  |  2 +-
 .../targets/mysql_user/tasks/main.yml         | 17 ++-----
 .../targets/mysql_variables/defaults/main.yml |  1 -
 .../mysql_variables/tasks/assert_var.yml      |  6 +--
 .../tasks/assert_var_output.yml               |  4 +-
 .../targets/mysql_variables/tasks/main.yml    |  4 +-
 .../targets/no_log/no_log_local.yml           |  1 -
 .../targets/nxos_command/tasks/cli.yaml       |  2 -
 .../targets/nxos_command/tasks/main.yaml      |  2 -
 .../targets/nxos_command/tasks/nxapi.yaml     |  2 -
 .../targets/nxos_config/defaults/main.yaml    |  1 -
 .../targets/nxos_config/tasks/cli.yaml        |  2 -
 .../targets/nxos_config/tasks/main.yaml       |  1 -
 .../targets/nxos_config/tasks/nxapi.yaml      |  2 -
 .../targets/nxos_facts/tasks/cli.yaml         |  2 -
 .../targets/nxos_facts/tasks/main.yaml        |  1 -
 .../targets/nxos_facts/tasks/nxapi.yaml       |  2 -
 .../targets/nxos_nxapi/defaults/main.yaml     |  1 -
 .../targets/nxos_nxapi/tasks/cli.yaml         |  2 -
 .../targets/nxos_nxapi/tasks/main.yaml        |  2 -
 .../targets/nxos_nxapi/tests/cli/enable.yaml  |  1 -
 .../targets/nxos_template/defaults/main.yaml  |  1 -
 .../targets/nxos_template/tasks/cli.yaml      |  2 -
 .../targets/nxos_template/tasks/main.yaml     |  1 -
 .../targets/nxos_template/tasks/nxapi.yaml    |  1 -
 .../targets/ops_command/tasks/cli.yaml        |  2 -
 .../targets/ops_command/tasks/main.yaml       |  1 -
 .../targets/parsing/bad_parsing.yml           |  4 +-
 .../targets/parsing/good_parsing.yml          |  2 +-
 .../roles/test_bad_parsing/tasks/main.yml     |  4 +-
 .../test_bad_parsing/tasks/scenario1.yml      |  1 -
 .../test_bad_parsing/tasks/scenario2.yml      |  1 -
 .../test_bad_parsing/tasks/scenario3.yml      |  1 -
 .../test_bad_parsing/tasks/scenario4.yml      |  1 -
 .../roles/test_good_parsing/tasks/main.yml    | 16 +++----
 test/integration/targets/pip/meta/main.yml    |  3 +-
 test/integration/targets/pip/tasks/pip.yml    |  1 -
 .../targets/postgresql/defaults/main.yml      |  1 -
 .../targets/postgresql/tasks/main.yml         |  1 -
 .../targets/prepare_win_tests/tasks/main.yml  |  1 -
 test/integration/targets/script/meta/main.yml |  3 +-
 .../targets/service/tasks/systemd_cleanup.yml |  1 -
 .../targets/service/tasks/sysv_cleanup.yml    |  1 -
 .../targets/service/tasks/sysv_setup.yml      |  1 -
 .../targets/setup_mysql_db/defaults/main.yml  |  2 +-
 .../targets/setup_mysql_db/vars/Debian.yml    |  2 +-
 .../targets/setup_mysql_db/vars/RedHat.yml    |  4 +-
 .../setup_postgresql_db/vars/Ubuntu-12.yml    |  1 -
 .../targets/special_vars/meta/main.yml        |  1 -
 test/integration/targets/stat/meta/main.yml   |  3 +-
 test/integration/targets/stat/tasks/main.yml  |  1 -
 .../targets/subversion/meta/main.yml          |  3 +-
 .../targets/subversion/tasks/main.yml         |  1 -
 .../targets/synchronize/meta/main.yml         |  3 +-
 .../targets/synchronize/tasks/main.yml        |  1 -
 test/integration/targets/tags/test_tags.yml   |  1 -
 .../targets/task_ordering/tasks/main.yml      |  1 -
 .../targets/template/meta/main.yml            |  3 +-
 .../targets/template/vars/main.yml            |  1 -
 .../test_templating_settings.yml              |  1 -
 .../targets/test_infra/test_test_infra.yml    |  1 -
 .../targets/unarchive/meta/main.yml           |  3 +-
 .../var_precedence/test_var_precedence.yml    |  1 -
 .../vault/roles/test_vault/tasks/main.yml     |  1 -
 .../roles/test_vault_embedded/tasks/main.yml  |  1 -
 .../targets/vyos_command/tasks/cli.yaml       |  2 -
 .../targets/vyos_command/tasks/main.yaml      |  1 -
 .../targets/vyos_config/tasks/cli.yaml        |  2 -
 .../targets/vyos_config/tasks/main.yaml       |  1 -
 .../targets/win_copy/meta/main.yml            |  3 +-
 .../targets/win_copy/tasks/main.yml           | 28 +++++------
 .../targets/win_file/meta/main.yml            |  3 +-
 .../targets/win_file/tasks/main.yml           |  7 ++-
 .../targets/win_get_url/tasks/main.yml        | 12 ++---
 .../targets/win_lineinfile/meta/main.yml      |  3 +-
 .../targets/win_lineinfile/tasks/main.yml     |  3 +-
 .../targets/win_ping/tasks/main.yml           |  4 +-
 .../targets/win_regedit/meta/main.yml         |  3 +-
 .../targets/win_regmerge/meta/main.yml        |  3 +-
 .../targets/win_regmerge/tasks/main.yml       |  2 +-
 .../targets/win_setup/tasks/main.yml          |  4 +-
 .../targets/win_stat/tasks/main.yml           |  8 ++--
 .../targets/win_template/meta/main.yml        |  3 +-
 .../targets/win_template/tasks/main.yml       | 44 ++++++++---------
 test/integration/targets/yum/tasks/main.yml   |  1 -
 .../integration/targets/zypper/tasks/main.yml |  1 -
 .../targets/zypper_repository/tasks/main.yml  |  1 -
 test/samples/ignore_errors.yml                |  1 -
 test/samples/include.yml                      |  1 -
 test/samples/l1_include.yml                   |  1 -
 test/samples/l2_include.yml                   |  1 -
 test/samples/localhost_include.yml            |  1 -
 test/samples/lookup_template.yml              |  1 -
 test/samples/test_include.yml                 |  1 -
 test/samples/test_pb.yml                      |  1 -
 test/samples/test_roles_complex.yml           |  1 -
 test/samples/with_together.yml                |  2 +-
 .../ec2.yml                                   |  1 -
 .../roles/ansible_test_deps/meta/main.yml     |  1 -
 .../roles/ansible_test_deps/tasks/main.yml    |  2 -
 .../roles/ansible_test_deps/test/main.yml     |  1 -
 .../roles/run_integration/tasks/main.yml      |  2 +-
 251 files changed, 214 insertions(+), 510 deletions(-)

diff --git a/test/integration/cloudflare.yml b/test/integration/cloudflare.yml
index 7b3891e717..ddae6f26da 100644
--- a/test/integration/cloudflare.yml
+++ b/test/integration/cloudflare.yml
@@ -1,8 +1,8 @@
 ---
-- hosts: localhost                                                              
-  connection: local                                                             
-  gather_facts: no                                                              
-  tags:                                                                         
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tags:
     - cloudflare
-  roles:                                                                        
-    - { role: test_cloudflare_dns, tags: test_cloudflare_dns }      
+  roles:
+    - { role: test_cloudflare_dns, tags: test_cloudflare_dns }
diff --git a/test/integration/galaxy_roles.yml b/test/integration/galaxy_roles.yml
index 3d2121f168..b323ffef6f 100644
--- a/test/integration/galaxy_roles.yml
+++ b/test/integration/galaxy_roles.yml
@@ -14,4 +14,3 @@
 - src: git@github.com:geerlingguy/ansible-role-php.git
   scm: git
   name: php
-
diff --git a/test/integration/integration_config.yml b/test/integration/integration_config.yml
index 440a4e61d4..3159daf196 100644
--- a/test/integration/integration_config.yml
+++ b/test/integration/integration_config.yml
@@ -3,4 +3,3 @@ win_output_dir: 'C:\ansible_testing'
 output_dir: ~/ansible_testing
 non_root_test_user: ansible
 pip_test_package: isort
-
diff --git a/test/integration/roles/test_azure/tasks/main.yml b/test/integration/roles/test_azure/tasks/main.yml
index a4d5d7ef59..2c46c44647 100644
--- a/test/integration/roles/test_azure/tasks/main.yml
+++ b/test/integration/roles/test_azure/tasks/main.yml
@@ -92,4 +92,3 @@
     that:
        - 'result.changed'
        - 'result.deployment.name == "{{ instance_name }}"'
-
diff --git a/test/integration/roles/test_cloudflare_dns/tasks/ns_record.yml b/test/integration/roles/test_cloudflare_dns/tasks/ns_record.yml
index aa00116bb7..2cf9528acf 100644
--- a/test/integration/roles/test_cloudflare_dns/tasks/ns_record.yml
+++ b/test/integration/roles/test_cloudflare_dns/tasks/ns_record.yml
@@ -1,8 +1,8 @@
 ---
 ######## NS record tests #################
 
-# the '.' at the end of the value is intentional                                
-# it must be verified that the '.' will be stripped   
+# the '.' at the end of the value is intentional
+# it must be verified that the '.' will be stripped
 - name: "Test: NS record creation"
   cloudflare_dns:
     account_email: "{{ cloudflare_email }}"
diff --git a/test/integration/roles/test_consul_kv/tasks/main.yml b/test/integration/roles/test_consul_kv/tasks/main.yml
index 0a7b01082c..585f93b371 100644
--- a/test/integration/roles/test_consul_kv/tasks/main.yml
+++ b/test/integration/roles/test_consul_kv/tasks/main.yml
@@ -70,7 +70,7 @@
 - name: kv test
   assert:
     that:
-      -  "{{item | match('somevalue_one')}}"
+      - "{{item | match('somevalue_one')}}"
   with_consul_kv:
     - 'key/to/lookup_one token={{acl_token}}'
 
@@ -78,7 +78,7 @@
 - name: recursive kv lookup test
   assert:
     that:
-      -  "{{item| match('somevalue_(one|two)')}}"
+      - "{{item| match('somevalue_(one|two)')}}"
   with_consul_kv:
     - 'key/to recurse=true token={{acl_token}}'
 
diff --git a/test/integration/roles/test_consul_service/tasks/main.yml b/test/integration/roles/test_consul_service/tasks/main.yml
index f7b28bf6b7..1b6643f59c 100644
--- a/test/integration/roles/test_consul_service/tasks/main.yml
+++ b/test/integration/roles/test_consul_service/tasks/main.yml
@@ -13,7 +13,7 @@
   consul:
     check_id: '{{item}}'
     state: absent
-  with_items: 
+  with_items:
     - node_level
     - node_level_http
 
diff --git a/test/integration/roles/test_consul_session/tasks/main.yml b/test/integration/roles/test_consul_session/tasks/main.yml
index aa5d49a2f9..ff1da0d392 100644
--- a/test/integration/roles/test_consul_session/tasks/main.yml
+++ b/test/integration/roles/test_consul_session/tasks/main.yml
@@ -1,4 +1,3 @@
-
 - name: register basic session with consul
   consul_session:
     name: session1
diff --git a/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml b/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml
index 92973290d4..3eed928736 100644
--- a/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml
+++ b/test/integration/roles/test_cs_securitygroup_rule/tasks/present.yml
@@ -5,7 +5,7 @@
     end_port: 8888
     cidr: 1.2.3.4/32
   register: sg_rule
-- name: verify create http range rule 
+- name: verify create http range rule
   assert:
     that:
     - sg_rule|success
diff --git a/test/integration/roles/test_cs_sshkeypair/tasks/main.yml b/test/integration/roles/test_cs_sshkeypair/tasks/main.yml
index 2f10e0da92..0d3f3f7546 100644
--- a/test/integration/roles/test_cs_sshkeypair/tasks/main.yml
+++ b/test/integration/roles/test_cs_sshkeypair/tasks/main.yml
@@ -38,7 +38,7 @@
 
 - name: test replace ssh public key
   cs_sshkeypair: |
-    name={{ cs_resource_prefix }}-sshkey 
+    name={{ cs_resource_prefix }}-sshkey
     public_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
   register: sshkey3
 - name: verify results of replace ssh public key
@@ -52,7 +52,7 @@
 
 - name: test replace ssh public key idempotence
   cs_sshkeypair: |
-    name={{ cs_resource_prefix }}-sshkey 
+    name={{ cs_resource_prefix }}-sshkey
     public_key="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDsTI7KJZ8tz/CwQIrSol41c6s3vzkGYCMI8o7P9Et48UG9eRoGaMaGYaTvBTj/VQrD7cfurI6Bn0HTT3FLK3OHOweyelm9rIiQ2hjkSl+2lIKWHu992GO58E5Gcy9yYW4sHGgGLNZkPBKrrj0w7lhmiHjPtVnf+2+7Ix1WOO2/HXPcAHhsX/AlyItDewIL4mr/BT83vq0202sPCiM2cFQJl+5WGwS1wYYK8d167cspsmdyX7OyAFCUB0vueuqjE8MFqJvyIJR9y8Lj9Ny71pSV5/QWrXUgELxMYOKSby3gHkxcIXgYBMFLl4DipRTO74OWQlRRaOlqXlOOQbikcY4T rene.moser@swisstxt.ch"
   register: sshkey4
 - name: verify results of ssh public key idempotence
diff --git a/test/integration/roles/test_ec2_asg/tasks/main.yml b/test/integration/roles/test_ec2_asg/tasks/main.yml
index 091eb2ab2b..08d8867a12 100644
--- a/test/integration/roles/test_ec2_asg/tasks/main.yml
+++ b/test/integration/roles/test_ec2_asg/tasks/main.yml
@@ -89,10 +89,10 @@
         load_balancer_port: 80
         instance_port: 80
     health_check:
-        ping_protocol: http 
+        ping_protocol: http
         ping_port: 80
         ping_path: "/"
-        response_timeout: 5 
+        response_timeout: 5
         interval: 30
         unhealthy_threshold: 3
         healthy_threshold: 3
@@ -125,7 +125,7 @@
       - "output.viable_instances == 1"
 
 
-# grow scaling group to 3 
+# grow scaling group to 3
 
 - name: add 2 more instances wait for instances to be deemed healthy (ELB)
   ec2_asg:
@@ -207,4 +207,4 @@
     ec2_secret_key: "{{ ec2_secret_key }}"
     region: "{{ ec2_region }}"
     state: absent
-  async: 300
\ No newline at end of file
+  async: 300
diff --git a/test/integration/roles/test_ec2_elb/tasks/main.yml b/test/integration/roles/test_ec2_elb/tasks/main.yml
index d613f985ab..94c6bf966c 100644
--- a/test/integration/roles/test_ec2_elb/tasks/main.yml
+++ b/test/integration/roles/test_ec2_elb/tasks/main.yml
@@ -185,4 +185,3 @@
       - 'item.changed == True'
       - '"{{resource_prefix}}" in item.ansible_facts.ec2_elbs'
   with_items: result.results
-
diff --git a/test/integration/roles/test_ec2_elb_lb/tasks/main.yml b/test/integration/roles/test_ec2_elb_lb/tasks/main.yml
index 8d73e854cf..4d48c9d393 100644
--- a/test/integration/roles/test_ec2_elb_lb/tasks/main.yml
+++ b/test/integration/roles/test_ec2_elb_lb/tasks/main.yml
@@ -405,4 +405,3 @@
        - 'result.changed'
        - 'result.elb.name == "{{tag_prefix}}"'
        - 'result.elb.status == "deleted"'
-
diff --git a/test/integration/roles/test_ec2_group/defaults/main.yml b/test/integration/roles/test_ec2_group/defaults/main.yml
index 4063791af4..a48051eac7 100644
--- a/test/integration/roles/test_ec2_group/defaults/main.yml
+++ b/test/integration/roles/test_ec2_group/defaults/main.yml
@@ -2,4 +2,3 @@
 # defaults file for test_ec2_group
 ec2_group_name: '{{resource_prefix}}'
 ec2_group_description: 'Created by ansible integration tests'
-
diff --git a/test/integration/roles/test_gce_pd/tasks/main.yml b/test/integration/roles/test_gce_pd/tasks/main.yml
index 70ee1ec10b..4341586bf3 100644
--- a/test/integration/roles/test_gce_pd/tasks/main.yml
+++ b/test/integration/roles/test_gce_pd/tasks/main.yml
@@ -217,4 +217,3 @@
     that:
        - 'result.failed'
        - 'result.msg == "Cannot give both image (debian-7) and snapshot ({{ instance_name }}-snapshot)"'
-
diff --git a/test/integration/roles/test_gce_tag/defaults/main.yml b/test/integration/roles/test_gce_tag/defaults/main.yml
index 077fd5353c..275fa02946 100644
--- a/test/integration/roles/test_gce_tag/defaults/main.yml
+++ b/test/integration/roles/test_gce_tag/defaults/main.yml
@@ -7,4 +7,3 @@ project_id: "{{ gce_project_id }}"
 zone: "us-central1-c"
 machine_type: f1-micro
 image: debian-8
-
diff --git a/test/integration/roles/test_rax_cbs/tasks/main.yml b/test/integration/roles/test_rax_cbs/tasks/main.yml
index 4df926c1a4..bfad02ee9f 100644
--- a/test/integration/roles/test_rax_cbs/tasks/main.yml
+++ b/test/integration/roles/test_rax_cbs/tasks/main.yml
@@ -88,7 +88,6 @@
 
 
 
-
 # ============================================================
 - name: Test rax_cbs with creds, region, name and invalid size
   rax_cbs:
diff --git a/test/integration/roles/test_rax_scaling_group/tasks/main.yml b/test/integration/roles/test_rax_scaling_group/tasks/main.yml
index efe3f86ee7..ab9d82a147 100644
--- a/test/integration/roles/test_rax_scaling_group/tasks/main.yml
+++ b/test/integration/roles/test_rax_scaling_group/tasks/main.yml
@@ -57,8 +57,6 @@
 
 
 
-
-
 # ============================================================
 - name: Test rax_scaling_group with creds, region and required args
   rax_scaling_group:
@@ -232,7 +230,6 @@
 
 
 
-
 # ============================================================
 - name: Test rax_scaling_group with invalid load balancers
   rax_scaling_group:
@@ -260,7 +257,6 @@
 
 
 
-
 # ============================================================
 - name: Build a CLB to test rax_scaling_group with
   rax_clb:
@@ -284,7 +280,6 @@
 
 
 
-
 # ============================================================
 - name: Test rax_scaling_group with load balancers
   rax_scaling_group:
@@ -339,7 +334,6 @@
 
 
 
-
 # ============================================================
 - name: Test rax_scaling_group files change 1
   rax_scaling_group:
@@ -470,7 +464,6 @@
 
 
 
-
 # ============================================================
 - name: Change max_entities
   rax_scaling_group:
@@ -496,7 +489,6 @@
 
 
 
-
 # ============================================================
 - name: Change min_entities
   rax_scaling_group:
@@ -522,7 +514,6 @@
 
 
 
-
 # ============================================================
 - name: Change server_name
   rax_scaling_group:
@@ -548,7 +539,6 @@
 
 
 
-
 # ============================================================
 - name: Change image
   rax_scaling_group:
@@ -574,7 +564,6 @@
 
 
 
-
 # ============================================================
 - name: Change flavor
   rax_scaling_group:
@@ -600,7 +589,6 @@
 
 
 
-
 # ============================================================
 - name: Change disk_config
   rax_scaling_group:
@@ -649,7 +637,6 @@
 
 
 
-
 # ============================================================
 - name: Change networks
   rax_scaling_group:
@@ -678,7 +665,6 @@
 
 
 
-
 # ============================================================
 - name: Change load balancers
   rax_scaling_group:
@@ -711,7 +697,6 @@
 
 
 
-
 # ============================================================
 - name: Create keypair to test with
   rax_keypair:
@@ -733,7 +718,6 @@
 
 
 
-
 # ============================================================
 - name: Change key_name
   rax_scaling_group:
@@ -767,7 +751,6 @@
 
 
 
-
 # ============================================================
 - name: Change config_drive
   rax_scaling_group:
@@ -837,7 +820,6 @@
 
 
 
-
 # ============================================================
 - name: Delete keypair
   rax_keypair:
@@ -858,7 +840,6 @@
 
 
 
-
 # ============================================================
 - name: Delete CLB
   rax_clb:
diff --git a/test/integration/targets/apache2_module/meta/main.yml b/test/integration/targets/apache2_module/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/apache2_module/meta/main.yml
+++ b/test/integration/targets/apache2_module/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/apt_repository/tasks/cleanup.yml b/test/integration/targets/apt_repository/tasks/cleanup.yml
index 86a09dd5ae..92280cedae 100644
--- a/test/integration/targets/apt_repository/tasks/cleanup.yml
+++ b/test/integration/targets/apt_repository/tasks/cleanup.yml
@@ -15,4 +15,3 @@
 - name: remove ppa key
   apt_key: id={{test_ppa_key}} state=absent
   ignore_errors: true
-
diff --git a/test/integration/targets/apt_repository/tasks/main.yml b/test/integration/targets/apt_repository/tasks/main.yml
index 38ae8f0447..79544006ae 100644
--- a/test/integration/targets/apt_repository/tasks/main.yml
+++ b/test/integration/targets/apt_repository/tasks/main.yml
@@ -18,4 +18,3 @@
 
 - include: 'apt.yml'
   when: ansible_distribution in ('Ubuntu')
-
diff --git a/test/integration/targets/asa_acl/tasks/main.yaml b/test/integration/targets/asa_acl/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/asa_acl/tasks/main.yaml
+++ b/test/integration/targets/asa_acl/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/asa_command/tasks/cli.yaml b/test/integration/targets/asa_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/asa_command/tasks/cli.yaml
+++ b/test/integration/targets/asa_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/asa_command/tasks/main.yaml b/test/integration/targets/asa_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/asa_command/tasks/main.yaml
+++ b/test/integration/targets/asa_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/asa_config/tasks/cli.yaml b/test/integration/targets/asa_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/asa_config/tasks/cli.yaml
+++ b/test/integration/targets/asa_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/asa_config/tasks/main.yaml b/test/integration/targets/asa_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/asa_config/tasks/main.yaml
+++ b/test/integration/targets/asa_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/assemble/tasks/main.yml b/test/integration/targets/assemble/tasks/main.yml
index d0c1f15e56..38d5532246 100644
--- a/test/integration/targets/assemble/tasks/main.yml
+++ b/test/integration/targets/assemble/tasks/main.yml
@@ -90,4 +90,3 @@
     that:
     - "result.state == 'file'"
     - "result.checksum == '505359f48c65b3904127cf62b912991d4da7ed6d'"
-
diff --git a/test/integration/targets/async/meta/main.yml b/test/integration/targets/async/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/async/meta/main.yml
+++ b/test/integration/targets/async/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/async/tasks/main.yml b/test/integration/targets/async/tasks/main.yml
index c6739dc256..4257223d20 100644
--- a/test/integration/targets/async/tasks/main.yml
+++ b/test/integration/targets/async/tasks/main.yml
@@ -57,7 +57,7 @@
         - "'finished' not in async_result or async_result.finished == 0"
 
 - name: test skipped task handling
-  command: /bin/true 
+  command: /bin/true
   async: 15
   poll: 0
   when: False
diff --git a/test/integration/targets/authorized_key/meta/main.yml b/test/integration/targets/authorized_key/meta/main.yml
index 145d4f7ca1..07faa21776 100644
--- a/test/integration/targets/authorized_key/meta/main.yml
+++ b/test/integration/targets/authorized_key/meta/main.yml
@@ -1,2 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
diff --git a/test/integration/targets/become/tasks/main.yml b/test/integration/targets/become/tasks/main.yml
index 86462d4eea..5f4a7efba9 100644
--- a/test/integration/targets/become/tasks/main.yml
+++ b/test/integration/targets/become/tasks/main.yml
@@ -80,4 +80,3 @@
     name: "{{ become_test_user }}"
     state: "absent"
     remove: "yes"
-
diff --git a/test/integration/targets/binary/meta/main.yml b/test/integration/targets/binary/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/binary/meta/main.yml
+++ b/test/integration/targets/binary/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/binary_modules/roles/test_binary_modules/tasks/main.yml b/test/integration/targets/binary_modules/roles/test_binary_modules/tasks/main.yml
index e7139dbf37..f999169b41 100644
--- a/test/integration/targets/binary_modules/roles/test_binary_modules/tasks/main.yml
+++ b/test/integration/targets/binary_modules/roles/test_binary_modules/tasks/main.yml
@@ -51,4 +51,3 @@
     that:
       - 'async_hello_ansible.msg == "Hello, Ansible!"'
   when: not async_hello_ansible|skipped
-
diff --git a/test/integration/targets/binary_modules/test_binary_modules.yml b/test/integration/targets/binary_modules/test_binary_modules.yml
index e5fd341cf2..e02271bea2 100644
--- a/test/integration/targets/binary_modules/test_binary_modules.yml
+++ b/test/integration/targets/binary_modules/test_binary_modules.yml
@@ -3,4 +3,3 @@
     - role: test_binary_modules
       tags:
         - test_binary_modules
-
diff --git a/test/integration/targets/changed_when/meta/main.yml b/test/integration/targets/changed_when/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/changed_when/meta/main.yml
+++ b/test/integration/targets/changed_when/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/changed_when/tasks/main.yml b/test/integration/targets/changed_when/tasks/main.yml
index 0e87b90340..a3736943b5 100644
--- a/test/integration/targets/changed_when/tasks/main.yml
+++ b/test/integration/targets/changed_when/tasks/main.yml
@@ -23,7 +23,7 @@
 - debug: var=shell_result
 
 - name: changed should always be true for shell
-  assert: 
+  assert:
     that:
        - "shell_result.changed"
 
@@ -35,8 +35,6 @@
 - debug: var=shell_result
 
 - name: changed should be false
-  assert: 
+  assert:
     that:
        - "not shell_result.changed"
-
-
diff --git a/test/integration/targets/check_mode/roles/test_always_run/meta/main.yml b/test/integration/targets/check_mode/roles/test_always_run/meta/main.yml
index b7cb12f7b6..58a728044b 100644
--- a/test/integration/targets/check_mode/roles/test_always_run/meta/main.yml
+++ b/test/integration/targets/check_mode/roles/test_always_run/meta/main.yml
@@ -15,4 +15,3 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/test/integration/targets/command_shell/meta/main.yml b/test/integration/targets/command_shell/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/command_shell/meta/main.yml
+++ b/test/integration/targets/command_shell/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/conditionals/tasks/main.yml b/test/integration/targets/conditionals/tasks/main.yml
index 0908b910fb..23f4afe54e 100644
--- a/test/integration/targets/conditionals/tasks/main.yml
+++ b/test/integration/targets/conditionals/tasks/main.yml
@@ -20,7 +20,7 @@
   shell: echo 'testing'
   when: 1 == 1
   register: result
- 
+
 - name: assert conditional '==' ran
   assert:
     that:
diff --git a/test/integration/targets/copy/meta/main.yml b/test/integration/targets/copy/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/copy/meta/main.yml
+++ b/test/integration/targets/copy/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/dellos10_command/tasks/cli.yaml b/test/integration/targets/dellos10_command/tasks/cli.yaml
index d648420ae7..8c11e106f2 100644
--- a/test/integration/targets/dellos10_command/tasks/cli.yaml
+++ b/test/integration/targets/dellos10_command/tasks/cli.yaml
@@ -14,5 +14,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos10_command/tasks/main.yaml b/test/integration/targets/dellos10_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos10_command/tasks/main.yaml
+++ b/test/integration/targets/dellos10_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos10_config/tasks/cli.yaml b/test/integration/targets/dellos10_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/dellos10_config/tasks/cli.yaml
+++ b/test/integration/targets/dellos10_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos10_config/tasks/main.yaml b/test/integration/targets/dellos10_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos10_config/tasks/main.yaml
+++ b/test/integration/targets/dellos10_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos10_facts/tasks/cli.yaml b/test/integration/targets/dellos10_facts/tasks/cli.yaml
index d648420ae7..8c11e106f2 100644
--- a/test/integration/targets/dellos10_facts/tasks/cli.yaml
+++ b/test/integration/targets/dellos10_facts/tasks/cli.yaml
@@ -14,5 +14,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos10_facts/tasks/main.yaml b/test/integration/targets/dellos10_facts/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos10_facts/tasks/main.yaml
+++ b/test/integration/targets/dellos10_facts/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos6_command/tasks/cli.yaml b/test/integration/targets/dellos6_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/dellos6_command/tasks/cli.yaml
+++ b/test/integration/targets/dellos6_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos6_command/tasks/main.yaml b/test/integration/targets/dellos6_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos6_command/tasks/main.yaml
+++ b/test/integration/targets/dellos6_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos6_config/tasks/cli.yaml b/test/integration/targets/dellos6_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/dellos6_config/tasks/cli.yaml
+++ b/test/integration/targets/dellos6_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos6_config/tasks/main.yaml b/test/integration/targets/dellos6_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos6_config/tasks/main.yaml
+++ b/test/integration/targets/dellos6_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos6_facts/tasks/cli.yaml b/test/integration/targets/dellos6_facts/tasks/cli.yaml
index d648420ae7..8c11e106f2 100644
--- a/test/integration/targets/dellos6_facts/tasks/cli.yaml
+++ b/test/integration/targets/dellos6_facts/tasks/cli.yaml
@@ -14,5 +14,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos6_facts/tasks/main.yaml b/test/integration/targets/dellos6_facts/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos6_facts/tasks/main.yaml
+++ b/test/integration/targets/dellos6_facts/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos9_command/tasks/cli.yaml b/test/integration/targets/dellos9_command/tasks/cli.yaml
index d648420ae7..8c11e106f2 100644
--- a/test/integration/targets/dellos9_command/tasks/cli.yaml
+++ b/test/integration/targets/dellos9_command/tasks/cli.yaml
@@ -14,5 +14,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos9_command/tasks/main.yaml b/test/integration/targets/dellos9_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos9_command/tasks/main.yaml
+++ b/test/integration/targets/dellos9_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos9_config/tasks/cli.yaml b/test/integration/targets/dellos9_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/dellos9_config/tasks/cli.yaml
+++ b/test/integration/targets/dellos9_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos9_config/tasks/main.yaml b/test/integration/targets/dellos9_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos9_config/tasks/main.yaml
+++ b/test/integration/targets/dellos9_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dellos9_facts/tasks/cli.yaml b/test/integration/targets/dellos9_facts/tasks/cli.yaml
index d648420ae7..8c11e106f2 100644
--- a/test/integration/targets/dellos9_facts/tasks/cli.yaml
+++ b/test/integration/targets/dellos9_facts/tasks/cli.yaml
@@ -14,5 +14,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/dellos9_facts/tasks/main.yaml b/test/integration/targets/dellos9_facts/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/dellos9_facts/tasks/main.yaml
+++ b/test/integration/targets/dellos9_facts/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/dnf/tasks/main.yml b/test/integration/targets/dnf/tasks/main.yml
index dd97a03d12..755c807e7d 100644
--- a/test/integration/targets/dnf/tasks/main.yml
+++ b/test/integration/targets/dnf/tasks/main.yml
@@ -20,4 +20,3 @@
 # We want to test that for people who don't want to upgrade their systems.
 - include: 'dnf.yml'
   when: (ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux'] and False) or (ansible_distribution in ['Fedora'] and ansible_distribution_major_version >= 23)
-
diff --git a/test/integration/targets/docker/tasks/docker-setup-debian.yml b/test/integration/targets/docker/tasks/docker-setup-debian.yml
index 068011a093..afe4b046dc 100644
--- a/test/integration/targets/docker/tasks/docker-setup-debian.yml
+++ b/test/integration/targets/docker/tasks/docker-setup-debian.yml
@@ -3,4 +3,3 @@
     state: present
     # Note: add docker-registry when available
     name: docker.io,python-docker,netcat-openbsd,nginx
-
diff --git a/test/integration/targets/docker/tasks/main.yml b/test/integration/targets/docker/tasks/main.yml
index 3689599523..31e42c83e6 100644
--- a/test/integration/targets/docker/tasks/main.yml
+++ b/test/integration/targets/docker/tasks/main.yml
@@ -20,4 +20,3 @@
 #- include: registry-tests.yml
   # Add other distributions as the proper packages become available
 #  when: ansible_distribution in ['Fedora']
-
diff --git a/test/integration/targets/docker/tasks/registry-tests.yml b/test/integration/targets/docker/tasks/registry-tests.yml
index 1ef330da5f..e17c383a09 100644
--- a/test/integration/targets/docker/tasks/registry-tests.yml
+++ b/test/integration/targets/docker/tasks/registry-tests.yml
@@ -103,12 +103,12 @@
 - name: Setup nginx with a user/password
   copy:
     src: docker-registry.htpasswd
-    dest:  /etc/nginx/docker-registry.htpasswd
+    dest: /etc/nginx/docker-registry.htpasswd
 
 - name: Setup nginx with a config file
   copy:
     src: nginx-docker-registry.conf
-    dest:  /etc/nginx/conf.d/nginx-docker-registry.conf
+    dest: /etc/nginx/conf.d/nginx-docker-registry.conf
 
 - name: Setup nginx docker cert
   copy:
@@ -186,4 +186,3 @@
     line: "127.0.0.1  dockertest.ansible.com"
     dest: /etc/hosts
     state: absent
-
diff --git a/test/integration/targets/eos_command/tasks/cli.yaml b/test/integration/targets/eos_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/eos_command/tasks/cli.yaml
+++ b/test/integration/targets/eos_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_command/tasks/eapi.yaml b/test/integration/targets/eos_command/tasks/eapi.yaml
index 0b01334bff..068881ab1b 100644
--- a/test/integration/targets/eos_command/tasks/eapi.yaml
+++ b/test/integration/targets/eos_command/tasks/eapi.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_command/tasks/main.yaml b/test/integration/targets/eos_command/tasks/main.yaml
index db05cb6233..970e74171e 100644
--- a/test/integration/targets/eos_command/tasks/main.yaml
+++ b/test/integration/targets/eos_command/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: eapi.yaml, tags: ['eapi'] }
-
diff --git a/test/integration/targets/eos_config/tasks/cli.yaml b/test/integration/targets/eos_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/eos_config/tasks/cli.yaml
+++ b/test/integration/targets/eos_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_config/tasks/eapi.yaml b/test/integration/targets/eos_config/tasks/eapi.yaml
index 0b01334bff..068881ab1b 100644
--- a/test/integration/targets/eos_config/tasks/eapi.yaml
+++ b/test/integration/targets/eos_config/tasks/eapi.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_config/tasks/main.yaml b/test/integration/targets/eos_config/tasks/main.yaml
index db05cb6233..970e74171e 100644
--- a/test/integration/targets/eos_config/tasks/main.yaml
+++ b/test/integration/targets/eos_config/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: eapi.yaml, tags: ['eapi'] }
-
diff --git a/test/integration/targets/eos_eapi/defaults/main.yaml b/test/integration/targets/eos_eapi/defaults/main.yaml
index 2a4e223ff0..9ef5ba5165 100644
--- a/test/integration/targets/eos_eapi/defaults/main.yaml
+++ b/test/integration/targets/eos_eapi/defaults/main.yaml
@@ -1,4 +1,3 @@
 ---
 testcase: "*"
 test_items: []
-
diff --git a/test/integration/targets/eos_eapi/tasks/cli.yaml b/test/integration/targets/eos_eapi/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/eos_eapi/tasks/cli.yaml
+++ b/test/integration/targets/eos_eapi/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_facts/tasks/cli.yaml b/test/integration/targets/eos_facts/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/eos_facts/tasks/cli.yaml
+++ b/test/integration/targets/eos_facts/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_facts/tasks/eapi.yaml b/test/integration/targets/eos_facts/tasks/eapi.yaml
index 0b01334bff..068881ab1b 100644
--- a/test/integration/targets/eos_facts/tasks/eapi.yaml
+++ b/test/integration/targets/eos_facts/tasks/eapi.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_facts/tasks/main.yaml b/test/integration/targets/eos_facts/tasks/main.yaml
index db05cb6233..970e74171e 100644
--- a/test/integration/targets/eos_facts/tasks/main.yaml
+++ b/test/integration/targets/eos_facts/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: eapi.yaml, tags: ['eapi'] }
-
diff --git a/test/integration/targets/eos_template/tasks/cli.yaml b/test/integration/targets/eos_template/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/eos_template/tasks/cli.yaml
+++ b/test/integration/targets/eos_template/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_template/tasks/eapi.yaml b/test/integration/targets/eos_template/tasks/eapi.yaml
index 0b01334bff..068881ab1b 100644
--- a/test/integration/targets/eos_template/tasks/eapi.yaml
+++ b/test/integration/targets/eos_template/tasks/eapi.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/eos_template/tasks/main.yaml b/test/integration/targets/eos_template/tasks/main.yaml
index db05cb6233..970e74171e 100644
--- a/test/integration/targets/eos_template/tasks/main.yaml
+++ b/test/integration/targets/eos_template/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: eapi.yaml, tags: ['eapi'] }
-
diff --git a/test/integration/targets/facts_d/meta/main.yml b/test/integration/targets/facts_d/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/facts_d/meta/main.yml
+++ b/test/integration/targets/facts_d/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/facts_d/tasks/main.yml b/test/integration/targets/facts_d/tasks/main.yml
index 3b5bba4075..facd19ff5c 100644
--- a/test/integration/targets/facts_d/tasks/main.yml
+++ b/test/integration/targets/facts_d/tasks/main.yml
@@ -22,12 +22,12 @@
 - shell: echo "[general]" > {{ fact_dir }}/preferences.fact
 - shell: echo "bar=loaded" >> {{ fact_dir }}/preferences.fact
 
-- setup: 
-    fact_path: "{{ fact_dir | expanduser }}"  
+- setup:
+    fact_path: "{{ fact_dir | expanduser }}"
     filter: "*local*"
   register: setup_result
 
-- debug: var=setup_result  
+- debug: var=setup_result
 
 - assert:
     that:
diff --git a/test/integration/targets/failed_when/tasks/main.yml b/test/integration/targets/failed_when/tasks/main.yml
index 4a5617e142..a4a73665b4 100644
--- a/test/integration/targets/failed_when/tasks/main.yml
+++ b/test/integration/targets/failed_when/tasks/main.yml
@@ -66,4 +66,3 @@
     that:
       - "'failed' in result and not result.failed"
       - "'failed_when_result' in result and not result.failed_when_result"
-
diff --git a/test/integration/targets/fetch/meta/main.yml b/test/integration/targets/fetch/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/fetch/meta/main.yml
+++ b/test/integration/targets/fetch/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/fetch/tasks/main.yml b/test/integration/targets/fetch/tasks/main.yml
index 4b6fb611e2..567032fb45 100644
--- a/test/integration/targets/fetch/tasks/main.yml
+++ b/test/integration/targets/fetch/tasks/main.yml
@@ -94,4 +94,3 @@
   assert:
     that:
       'diff.stdout == ""'
-
diff --git a/test/integration/targets/file/meta/main.yml b/test/integration/targets/file/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/file/meta/main.yml
+++ b/test/integration/targets/file/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/file/tasks/main.yml b/test/integration/targets/file/tasks/main.yml
index c6cbd6f6ad..91d6f8ed0d 100644
--- a/test/integration/targets/file/tasks/main.yml
+++ b/test/integration/targets/file/tasks/main.yml
@@ -108,7 +108,7 @@
 
 - name: touch a hard link
   file: src={{output_file}} dest={{output_dir}}/hard.txt state=touch
-  register: file6_touch_result  
+  register: file6_touch_result
 
 - name: verify that the hard link was touched
   assert:
diff --git a/test/integration/targets/file/tasks/selinux_tests.yml b/test/integration/targets/file/tasks/selinux_tests.yml
index b0f6e17de2..5589ca5dac 100644
--- a/test/integration/targets/file/tasks/selinux_tests.yml
+++ b/test/integration/targets/file/tasks/selinux_tests.yml
@@ -27,4 +27,4 @@
       - "file_se_result.secontext == 'unconfined_u:object_r:admin_home_t:s0'"
 
 - name: remove the file used for testing
-  file: path={{output_dir}}/foo-se.txt state=absent
\ No newline at end of file
+  file: path={{output_dir}}/foo-se.txt state=absent
diff --git a/test/integration/targets/filters/meta/main.yml b/test/integration/targets/filters/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/filters/meta/main.yml
+++ b/test/integration/targets/filters/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/filters/tasks/main.yml b/test/integration/targets/filters/tasks/main.yml
index 03566220e5..fce05c0c21 100644
--- a/test/integration/targets/filters/tasks/main.yml
+++ b/test/integration/targets/filters/tasks/main.yml
@@ -109,4 +109,3 @@
   assert:
     that:
       - "users | json_query('[*].hosts[].host') == ['host_a', 'host_b', 'host_c', 'host_d']"
-
diff --git a/test/integration/targets/gathering_facts/test_gathering_facts.yml b/test/integration/targets/gathering_facts/test_gathering_facts.yml
index dcd055eee7..4b935434b3 100644
--- a/test/integration/targets/gathering_facts/test_gathering_facts.yml
+++ b/test/integration/targets/gathering_facts/test_gathering_facts.yml
@@ -129,4 +129,3 @@
           - 'ansible_interfaces|default("UNDEF_NET") != "UNDEF_NET"'
           - 'ansible_mounts|default("UNDEF_HW") == "UNDEF_HW"'
           - 'ansible_virtualization_role|default("UNDEF_VIRT") == "UNDEF_VIRT"'
-
diff --git a/test/integration/targets/gem/meta/main.yml b/test/integration/targets/gem/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/gem/meta/main.yml
+++ b/test/integration/targets/gem/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/gem/tasks/main.yml b/test/integration/targets/gem/tasks/main.yml
index 476e602634..adf76d7c33 100644
--- a/test/integration/targets/gem/tasks/main.yml
+++ b/test/integration/targets/gem/tasks/main.yml
@@ -23,18 +23,17 @@
   shell: gem list | egrep '^gist '
   register: uninstall
   failed_when: "uninstall.rc != 1"
- 
+
 - name: install a gem
   gem: name=gist state=present
   register: gem_result
 
 - name: verify module output properties
-  assert: 
-    that: 
+  assert:
+    that:
         - "'name' in gem_result"
-        - "'changed' in gem_result" 
-        - "'state' in gem_result" 
+        - "'changed' in gem_result"
+        - "'state' in gem_result"
 
 - name: verify gist is installed
-  shell: gem list | egrep '^gist ' 
-     
+  shell: gem list | egrep '^gist '
diff --git a/test/integration/targets/get_url/meta/main.yml b/test/integration/targets/get_url/meta/main.yml
index b5f2416aed..a5f3f70736 100644
--- a/test/integration/targets/get_url/meta/main.yml
+++ b/test/integration/targets/get_url/meta/main.yml
@@ -1,4 +1,3 @@
 dependencies:
   - prepare_tests
   - prepare_http_tests
-
diff --git a/test/integration/targets/get_url/tasks/main.yml b/test/integration/targets/get_url/tasks/main.yml
index 521dd9efab..f95158eabd 100644
--- a/test/integration/targets/get_url/tasks/main.yml
+++ b/test/integration/targets/get_url/tasks/main.yml
@@ -37,15 +37,15 @@
     geturl_dstfile: "{{ output_dir | expanduser }}/aurlfile_copy.txt"
 
 - name: Create source file
-  copy: 
-    dest: "{{ geturl_srcfile }}" 
-    content: "foobar" 
+  copy:
+    dest: "{{ geturl_srcfile }}"
+    content: "foobar"
 
 - name: test file fetch
   get_url:
     url: "{{ 'file://' + geturl_srcfile }}"
-    dest: "{{ geturl_dstfile }}"  
-  register: result  
+    dest: "{{ geturl_dstfile }}"
+  register: result
 
 - name: assert success and change
   assert:
@@ -56,8 +56,8 @@
 - name: test nonexisting file fetch
   get_url:
     url: "{{ 'file://' + geturl_srcfile + 'NOFILE' }}"
-    dest: "{{ geturl_dstfile + 'NOFILE' }}"  
-  register: result  
+    dest: "{{ geturl_dstfile + 'NOFILE' }}"
+  register: result
   ignore_errors: True
 
 - name: assert success and change
diff --git a/test/integration/targets/git/meta/main.yml b/test/integration/targets/git/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/git/meta/main.yml
+++ b/test/integration/targets/git/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/handlers/roles/test_force_handlers/handlers/main.yml b/test/integration/targets/handlers/roles/test_force_handlers/handlers/main.yml
index 2cfb1ef710..962d7561d1 100644
--- a/test/integration/targets/handlers/roles/test_force_handlers/handlers/main.yml
+++ b/test/integration/targets/handlers/roles/test_force_handlers/handlers/main.yml
@@ -1,2 +1,2 @@
 - name: echoing handler
-  command: echo CALLED_HANDLER_{{ inventory_hostname }}
\ No newline at end of file
+  command: echo CALLED_HANDLER_{{ inventory_hostname }}
diff --git a/test/integration/targets/handlers/roles/test_force_handlers/tasks/main.yml b/test/integration/targets/handlers/roles/test_force_handlers/tasks/main.yml
index ea01660ba7..f5d78c7372 100644
--- a/test/integration/targets/handlers/roles/test_force_handlers/tasks/main.yml
+++ b/test/integration/targets/handlers/roles/test_force_handlers/tasks/main.yml
@@ -21,6 +21,6 @@
 - name: EXPECTED FAILURE fail task for C
   fail: msg="Fail C"
   when: inventory_hostname == 'C'
-  
+
 - name: echo after A and C have failed
-  command: echo CALLED_TASK_{{ inventory_hostname }}
\ No newline at end of file
+  command: echo CALLED_TASK_{{ inventory_hostname }}
diff --git a/test/integration/targets/handlers/roles/test_handlers/handlers/main.yml b/test/integration/targets/handlers/roles/test_handlers/handlers/main.yml
index b8ee48b5c8..0261f93569 100644
--- a/test/integration/targets/handlers/roles/test_handlers/handlers/main.yml
+++ b/test/integration/targets/handlers/roles/test_handlers/handlers/main.yml
@@ -1,5 +1,5 @@
 - name: set handler fact
-  set_fact: 
+  set_fact:
     handler_called: True
 - name: test handler
   debug: msg="handler called"
diff --git a/test/integration/targets/handlers/roles/test_handlers/meta/main.yml b/test/integration/targets/handlers/roles/test_handlers/meta/main.yml
index 74d2c33354..32cf5dda7e 100644
--- a/test/integration/targets/handlers/roles/test_handlers/meta/main.yml
+++ b/test/integration/targets/handlers/roles/test_handlers/meta/main.yml
@@ -1,2 +1 @@
 dependencies: []
-
diff --git a/test/integration/targets/handlers/roles/test_handlers/tasks/main.yml b/test/integration/targets/handlers/roles/test_handlers/tasks/main.yml
index 1c1d819269..a857dacf6e 100644
--- a/test/integration/targets/handlers/roles/test_handlers/tasks/main.yml
+++ b/test/integration/targets/handlers/roles/test_handlers/tasks/main.yml
@@ -24,7 +24,7 @@
 
 - name: notify the handler for host A only
   shell: echo
-  notify: 
+  notify:
     - set handler fact
   when: inventory_hostname == 'A'
   tags: scenario1
diff --git a/test/integration/targets/handlers/roles/test_handlers_meta/handlers/main.yml b/test/integration/targets/handlers/roles/test_handlers_meta/handlers/main.yml
index 634e6eca2a..323fc4399d 100644
--- a/test/integration/targets/handlers/roles/test_handlers_meta/handlers/main.yml
+++ b/test/integration/targets/handlers/roles/test_handlers_meta/handlers/main.yml
@@ -1,5 +1,5 @@
 - name: set_handler_fact_1
-  set_fact: 
+  set_fact:
     handler1_called: True
 
 - name: set_handler_fact_2
diff --git a/test/integration/targets/handlers/roles/test_handlers_meta/tasks/main.yml b/test/integration/targets/handlers/roles/test_handlers_meta/tasks/main.yml
index 047b61ce88..64d23c74b0 100644
--- a/test/integration/targets/handlers/roles/test_handlers_meta/tasks/main.yml
+++ b/test/integration/targets/handlers/roles/test_handlers_meta/tasks/main.yml
@@ -18,13 +18,13 @@
 
 - name: notify the first handler
   shell: echo
-  notify: 
+  notify:
     - set_handler_fact_1
 
 - name: force handler execution now
   meta: "flush_handlers"
 
-- name: assert handler1 ran and not handler2 
+- name: assert handler1 ran and not handler2
   assert:
     that:
         - "handler1_called is defined"
@@ -36,6 +36,5 @@
 
 - name: notify the second handler
   shell: echo
-  notify: 
+  notify:
     - set_handler_fact_2
-
diff --git a/test/integration/targets/handlers/test_handlers.yml b/test/integration/targets/handlers/test_handlers.yml
index dafa9ceebe..87d04b6c90 100644
--- a/test/integration/targets/handlers/test_handlers.yml
+++ b/test/integration/targets/handlers/test_handlers.yml
@@ -12,7 +12,7 @@
   connection: local
   tasks:
     - name: verify handler2 ran
-      assert: 
+      assert:
         that:
             - "not hostvars[inventory_hostname]['handler1_called']"
             - "'handler2_called' in hostvars[inventory_hostname]"
diff --git a/test/integration/targets/hash/roles/test_hash_behavior/meta/main.yml b/test/integration/targets/hash/roles/test_hash_behavior/meta/main.yml
index c3dcf7aaf9..59adf99706 100644
--- a/test/integration/targets/hash/roles/test_hash_behavior/meta/main.yml
+++ b/test/integration/targets/hash/roles/test_hash_behavior/meta/main.yml
@@ -15,4 +15,3 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-
diff --git a/test/integration/targets/hash/roles/test_hash_behavior/tasks/main.yml b/test/integration/targets/hash/roles/test_hash_behavior/tasks/main.yml
index 463141edd3..5912898596 100644
--- a/test/integration/targets/hash/roles/test_hash_behavior/tasks/main.yml
+++ b/test/integration/targets/hash/roles/test_hash_behavior/tasks/main.yml
@@ -19,13 +19,13 @@
 - name: get the hash behavior env setting
   shell: env | grep ^ANSIBLE_HASH_BEHAVIOUR'=' | cut -f2- -d'='
   register: hash_behavior
-  # This only works with the local connection.  The way this test is run means the 
+  # This only works with the local connection.  The way this test is run means the
   connection: local
   delegate_to: localhost
 
 
 - name: debug hash behavior result
-  debug: var=hash_behavior.stdout 
+  debug: var=hash_behavior.stdout
 
 - name: assert hash behavior is merge or replace
   assert:
@@ -39,4 +39,3 @@
   assert:
     that:
     - "hash_behavior.stdout == 'merge' and test_hash == merged_hash or hash_behavior.stdout == 'replace' and test_hash == replaced_hash"
-
diff --git a/test/integration/targets/hg/meta/main.yml b/test/integration/targets/hg/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/hg/meta/main.yml
+++ b/test/integration/targets/hg/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/hg/tasks/main.yml b/test/integration/targets/hg/tasks/main.yml
index 4eee22e4c7..03b3458ede 100644
--- a/test/integration/targets/hg/tasks/main.yml
+++ b/test/integration/targets/hg/tasks/main.yml
@@ -43,7 +43,7 @@
       - "'before' in hg_result"
       - "'after' in hg_result"
       - "not hg_result.before"
-      - "hg_result.changed"      
+      - "hg_result.changed"
 
 - name: repeated checkout
   hg: repo={{ repo }} dest={{ checkout_dir }}
@@ -72,7 +72,3 @@
   assert:
     that:
       - "not hg_result2.changed"
-
-
-
-
diff --git a/test/integration/targets/ignore_errors/meta/main.yml b/test/integration/targets/ignore_errors/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/ignore_errors/meta/main.yml
+++ b/test/integration/targets/ignore_errors/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/ignore_errors/tasks/main.yml b/test/integration/targets/ignore_errors/tasks/main.yml
index e0d6ae2f16..a6964e0406 100644
--- a/test/integration/targets/ignore_errors/tasks/main.yml
+++ b/test/integration/targets/ignore_errors/tasks/main.yml
@@ -20,4 +20,3 @@
   shell: /bin/false
   register: failed
   ignore_errors: True
-
diff --git a/test/integration/targets/includes/roles/test_includes/handlers/main.yml b/test/integration/targets/includes/roles/test_includes/handlers/main.yml
index 25e7d3886f..7d3e625f7f 100644
--- a/test/integration/targets/includes/roles/test_includes/handlers/main.yml
+++ b/test/integration/targets/includes/roles/test_includes/handlers/main.yml
@@ -1,2 +1 @@
 - include: more_handlers.yml
-
diff --git a/test/integration/targets/includes/roles/test_includes/handlers/more_handlers.yml b/test/integration/targets/includes/roles/test_includes/handlers/more_handlers.yml
index 947ede8d91..c85d53ccff 100644
--- a/test/integration/targets/includes/roles/test_includes/handlers/more_handlers.yml
+++ b/test/integration/targets/includes/roles/test_includes/handlers/more_handlers.yml
@@ -10,5 +10,3 @@
       - "ca == 4001"
       - "cb == 4002"
       - "cc == 4003"
-
-
diff --git a/test/integration/targets/includes/roles/test_includes/tasks/included_task1.yml b/test/integration/targets/includes/roles/test_includes/tasks/included_task1.yml
index 8fe79a1cb7..6f4c048091 100644
--- a/test/integration/targets/includes/roles/test_includes/tasks/included_task1.yml
+++ b/test/integration/targets/includes/roles/test_includes/tasks/included_task1.yml
@@ -1,10 +1,9 @@
-- set_fact: 
+- set_fact:
     ca: "{{ a }}"
 - debug: var=ca
-- set_fact: 
+- set_fact:
     cb: "{{b}}"
 - debug: var=cb
 - set_fact:
     cc: "{{ c }}"
 - debug: var=cc
-
diff --git a/test/integration/targets/includes/roles/test_includes/tasks/main.yml b/test/integration/targets/includes/roles/test_includes/tasks/main.yml
index 33aefe8959..3add6721c5 100644
--- a/test/integration/targets/includes/roles/test_includes/tasks/main.yml
+++ b/test/integration/targets/includes/roles/test_includes/tasks/main.yml
@@ -26,7 +26,7 @@
       - "cb == '2'"
       - "cc == '3'"
 
-- set_fact: 
+- set_fact:
      a: 101
      b: 102
      c: 103
@@ -34,7 +34,7 @@
 - include: included_task1.yml a={{a}} b={{b}} c=103
 
 - name: verify variable include params
-  assert: 
+  assert:
     that:
       - "ca == 101"
       - "cb == 102"
@@ -80,5 +80,3 @@
     # both these via a handler include
     - included_handler
     - verify_handler
-
-
diff --git a/test/integration/targets/includes/test_includes2.yml b/test/integration/targets/includes/test_includes2.yml
index 1b15682d70..d8dcf10e15 100644
--- a/test/integration/targets/includes/test_includes2.yml
+++ b/test/integration/targets/includes/test_includes2.yml
@@ -1,8 +1,7 @@
-
 - name: verify playbook includes can take parameters
   hosts: testhost
   tasks:
-    - assert: 
+    - assert:
         that:
           - "parameter1 == 'asdf'"
           - "parameter2 == 'jkl'"
@@ -10,7 +9,7 @@
 - name: verify task include logic
   hosts: testhost
   gather_facts: True
-  roles: 
+  roles:
     - { role: test_includes, tags: test_includes }
   tasks:
     - include: roles/test_includes/tasks/not_a_role_task.yml
diff --git a/test/integration/targets/ios_command/tasks/cli.yaml b/test/integration/targets/ios_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/ios_command/tasks/cli.yaml
+++ b/test/integration/targets/ios_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/ios_command/tasks/main.yaml b/test/integration/targets/ios_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/ios_command/tasks/main.yaml
+++ b/test/integration/targets/ios_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/ios_config/tasks/cli.yaml b/test/integration/targets/ios_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/ios_config/tasks/cli.yaml
+++ b/test/integration/targets/ios_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/ios_config/tasks/main.yaml b/test/integration/targets/ios_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/ios_config/tasks/main.yaml
+++ b/test/integration/targets/ios_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/ios_facts/tasks/cli.yaml b/test/integration/targets/ios_facts/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/ios_facts/tasks/cli.yaml
+++ b/test/integration/targets/ios_facts/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/ios_facts/tasks/main.yaml b/test/integration/targets/ios_facts/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/ios_facts/tasks/main.yaml
+++ b/test/integration/targets/ios_facts/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/ios_template/tasks/cli.yaml b/test/integration/targets/ios_template/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/ios_template/tasks/cli.yaml
+++ b/test/integration/targets/ios_template/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/ios_template/tasks/main.yaml b/test/integration/targets/ios_template/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/ios_template/tasks/main.yaml
+++ b/test/integration/targets/ios_template/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/iosxr_command/tasks/cli.yaml b/test/integration/targets/iosxr_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/iosxr_command/tasks/cli.yaml
+++ b/test/integration/targets/iosxr_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/iosxr_command/tasks/main.yaml b/test/integration/targets/iosxr_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/iosxr_command/tasks/main.yaml
+++ b/test/integration/targets/iosxr_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/iosxr_config/tasks/cli.yaml b/test/integration/targets/iosxr_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/iosxr_config/tasks/cli.yaml
+++ b/test/integration/targets/iosxr_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/iosxr_config/tasks/main.yaml b/test/integration/targets/iosxr_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/iosxr_config/tasks/main.yaml
+++ b/test/integration/targets/iosxr_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/iosxr_facts/tasks/cli.yaml b/test/integration/targets/iosxr_facts/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/iosxr_facts/tasks/cli.yaml
+++ b/test/integration/targets/iosxr_facts/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/iosxr_facts/tasks/main.yaml b/test/integration/targets/iosxr_facts/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/iosxr_facts/tasks/main.yaml
+++ b/test/integration/targets/iosxr_facts/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/iosxr_template/tasks/cli.yaml b/test/integration/targets/iosxr_template/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/iosxr_template/tasks/cli.yaml
+++ b/test/integration/targets/iosxr_template/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/iosxr_template/tasks/main.yaml b/test/integration/targets/iosxr_template/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/iosxr_template/tasks/main.yaml
+++ b/test/integration/targets/iosxr_template/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/iterators/meta/main.yml b/test/integration/targets/iterators/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/iterators/meta/main.yml
+++ b/test/integration/targets/iterators/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/iterators/tasks/main.yml b/test/integration/targets/iterators/tasks/main.yml
index 584144af77..e42707753b 100644
--- a/test/integration/targets/iterators/tasks/main.yml
+++ b/test/integration/targets/iterators/tasks/main.yml
@@ -253,5 +253,3 @@
         - "b__ == 'flattened'"
         - "c__ == 'flattened'"
         - "d__ == 'flattened'"
-
-
diff --git a/test/integration/targets/junos_command/tasks/main.yaml b/test/integration/targets/junos_command/tasks/main.yaml
index 9924bd301d..63e60969d9 100644
--- a/test/integration/targets/junos_command/tasks/main.yaml
+++ b/test/integration/targets/junos_command/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: netconf_xml.yaml, tags: ['netconf', 'xml'] }
 - { include: netconf_text.yaml, tags: ['netconf', 'text'] }
-
diff --git a/test/integration/targets/junos_command/tasks/netconf_text.yaml b/test/integration/targets/junos_command/tasks/netconf_text.yaml
index 3f123c1284..1495e35912 100644
--- a/test/integration/targets/junos_command/tasks/netconf_text.yaml
+++ b/test/integration/targets/junos_command/tasks/netconf_text.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/junos_command/tasks/netconf_xml.yaml b/test/integration/targets/junos_command/tasks/netconf_xml.yaml
index 93b6def35f..4b5fe9d17f 100644
--- a/test/integration/targets/junos_command/tasks/netconf_xml.yaml
+++ b/test/integration/targets/junos_command/tasks/netconf_xml.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/junos_config/defaults/main.yaml b/test/integration/targets/junos_config/defaults/main.yaml
index 72860d74e5..5f709c5aac 100644
--- a/test/integration/targets/junos_config/defaults/main.yaml
+++ b/test/integration/targets/junos_config/defaults/main.yaml
@@ -1,3 +1,2 @@
 ---
 testcase: "*"
-
diff --git a/test/integration/targets/junos_config/tasks/main.yaml b/test/integration/targets/junos_config/tasks/main.yaml
index 40d799545c..cc27f174fd 100644
--- a/test/integration/targets/junos_config/tasks/main.yaml
+++ b/test/integration/targets/junos_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: netconf.yaml, tags: ['netconf'] }
-
diff --git a/test/integration/targets/junos_config/tasks/netconf.yaml b/test/integration/targets/junos_config/tasks/netconf.yaml
index 46debc247c..bd91bd88ce 100644
--- a/test/integration/targets/junos_config/tasks/netconf.yaml
+++ b/test/integration/targets/junos_config/tasks/netconf.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/junos_netconf/tasks/cli.yaml b/test/integration/targets/junos_netconf/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/junos_netconf/tasks/cli.yaml
+++ b/test/integration/targets/junos_netconf/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/junos_netconf/tasks/main.yaml b/test/integration/targets/junos_netconf/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/junos_netconf/tasks/main.yaml
+++ b/test/integration/targets/junos_netconf/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/junos_template/defaults/main.yaml b/test/integration/targets/junos_template/defaults/main.yaml
index 4f2a9a84ec..822f2213a4 100644
--- a/test/integration/targets/junos_template/defaults/main.yaml
+++ b/test/integration/targets/junos_template/defaults/main.yaml
@@ -1,4 +1,3 @@
 ---
 testcase: "*"
 test_cases: []
-
diff --git a/test/integration/targets/junos_template/tasks/main.yaml b/test/integration/targets/junos_template/tasks/main.yaml
index 40d799545c..cc27f174fd 100644
--- a/test/integration/targets/junos_template/tasks/main.yaml
+++ b/test/integration/targets/junos_template/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: netconf.yaml, tags: ['netconf'] }
-
diff --git a/test/integration/targets/junos_template/tasks/netconf.yaml b/test/integration/targets/junos_template/tasks/netconf.yaml
index 46debc247c..bd91bd88ce 100644
--- a/test/integration/targets/junos_template/tasks/netconf.yaml
+++ b/test/integration/targets/junos_template/tasks/netconf.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/lookup_paths/testplay.yml b/test/integration/targets/lookup_paths/testplay.yml
index 8bf4be2c08..939bf22dac 100644
--- a/test/integration/targets/lookup_paths/testplay.yml
+++ b/test/integration/targets/lookup_paths/testplay.yml
@@ -16,4 +16,3 @@
         that:
             - 'play_result == play_out'
             - 'role_result == role_out'
-
diff --git a/test/integration/targets/lookups/meta/main.yml b/test/integration/targets/lookups/meta/main.yml
index ee75ae6e65..8169f34744 100644
--- a/test/integration/targets/lookups/meta/main.yml
+++ b/test/integration/targets/lookups/meta/main.yml
@@ -1,4 +1,3 @@
 dependencies: 
   - prepare_tests
   - prepare_http_tests
-
diff --git a/test/integration/targets/lookups/tasks/main.yml b/test/integration/targets/lookups/tasks/main.yml
index f861ceaede..86a627b33c 100644
--- a/test/integration/targets/lookups/tasks/main.yml
+++ b/test/integration/targets/lookups/tasks/main.yml
@@ -22,13 +22,13 @@
   copy: dest={{output_dir}}/foo.txt mode=0644 content="bar"
 
 - name: load the file as a fact
-  set_fact: 
+  set_fact:
     foo: "{{ lookup('file', output_dir + '/foo.txt' ) }}"
 
 - debug: var=foo
 
-- name: verify file lookup 
-  assert: 
+- name: verify file lookup
+  assert:
     that:
         - "foo == 'bar'"
 
@@ -43,7 +43,7 @@
   - "{{output_dir}}/lookup"
 
 - name: create a password file
-  set_fact: 
+  set_fact:
     newpass: "{{ lookup('password', output_dir + '/lookup/password length=8') }}"
 
 - name: stat the password file directory
@@ -143,7 +143,7 @@
 
 - name: get first environment var value
   shell: echo {{ '$' + known_var_name.stdout }}
-  register: known_var_value 
+  register: known_var_value
 
 - name: use env lookup to get known var
   set_fact:
diff --git a/test/integration/targets/mysql_db/defaults/main.yml b/test/integration/targets/mysql_db/defaults/main.yml
index 456ba0eb4c..d2c43b5e87 100644
--- a/test/integration/targets/mysql_db/defaults/main.yml
+++ b/test/integration/targets/mysql_db/defaults/main.yml
@@ -5,4 +5,3 @@ db_user1: 'datauser1'
 db_user2: 'datauser2'
 
 tmp_dir: '/tmp'
-
diff --git a/test/integration/targets/mysql_db/tasks/main.yml b/test/integration/targets/mysql_db/tasks/main.yml
index 1c2adcce8e..bca2161789 100644
--- a/test/integration/targets/mysql_db/tasks/main.yml
+++ b/test/integration/targets/mysql_db/tasks/main.yml
@@ -27,7 +27,7 @@
   mysql_db: name={{ db_name }} state=present
   register: result
 
-- name: assert output message that database exist 
+- name: assert output message that database exist
   assert:
     that:
        - "result.changed == true"
@@ -37,7 +37,7 @@
   command: mysql "-e show databases like '{{ db_name }}';"
   register: result
 
-- name: assert database exist 
+- name: assert database exist
   assert: { that: "'{{ db_name }}' in result.stdout" }
 
 # ============================================================
@@ -45,7 +45,7 @@
   mysql_db: name={{ db_name }} state=absent
   register: result
 
-- name: assert output message that database does not exist 
+- name: assert output message that database does not exist
   assert:
     that:
        - "result.changed == true"
@@ -55,14 +55,14 @@
   command: mysql "-e show databases like '{{ db_name }}';"
   register: result
 
-- name: assert database does not exist   
+- name: assert database does not exist
   assert: { that: "'{{ db_name }}' not in result.stdout" }
 
 # ============================================================
 - name: test mysql_db encoding param not valid - issue 8075
-  mysql_db: name=datanotvalid state=present encoding=notvalid 
+  mysql_db: name=datanotvalid state=present encoding=notvalid
   register: result
-  ignore_errors: true 
+  ignore_errors: true
 
 - name: assert test mysql_db encoding param not valid - issue 8075 (failed=true)
   assert:
@@ -75,11 +75,11 @@
 - name: test mysql_db using a valid encoding utf8 (expect changed=true)
   mysql_db: name=en{{ db_name }}  state=present encoding=utf8
   register: result
- 
-- name: assert output message created a database   
+
+- name: assert output message created a database
   assert: { that: "result.changed == true" }
 
-- name: test database was created  
+- name: test database was created
   command: mysql "-e SHOW CREATE DATABASE en{{ db_name }};"
   register: result
 
@@ -94,17 +94,17 @@
   mysql_db: name=en{{ db_name }}  state=present encoding=binary
   register: result
 
-- name: assert output message that database was created 
+- name: assert output message that database was created
   assert: { that: "result.changed == true" }
 
-- name: run command to test database was created 
+- name: run command to test database was created
   command: mysql "-e SHOW CREATE DATABASE en{{ db_name }};"
   register: result
 
 - name: assert created database is of encoding binary
   assert: { that: "'binary' in result.stdout" }
 
-- name: remove database 
+- name: remove database
   mysql_db: name=en{{ db_name }}  state=absent
 
 # ============================================================
@@ -115,26 +115,26 @@
   mysql_db: name={{ db_user1 }} state=present login_user=user1 login_password=password1
   register: result
 
-- name: assert output message that database was created 
+- name: assert output message that database was created
   assert: { that: "result.changed == true" }
 
 - name: run command to test database was created using user1
   command: mysql "-e show databases like '{{ db_user1 }}';"
   register: result
 
-- name: assert database exist 
+- name: assert database exist
   assert: { that: "'{{ db_user1 }}' in result.stdout" }
 
 # ============================================================
 - name: create user2 to access database with privilege select only
-  mysql_user: name=user2 password=password2 priv=*.*:SELECT state=present 
+  mysql_user: name=user2 password=password2 priv=*.*:SELECT state=present
 
 - name: create database dbuser2 using user2 with no privilege to create (expect failed=true)
   mysql_db: name={{ db_user2 }} state=present login_user=user2 login_password=password2
   register: result
   ignore_errors: true
 
-- name: assert output message that database was not created using dbuser2 
+- name: assert output message that database was not created using dbuser2
   assert:
     that:
        - "result.failed == true"
@@ -144,7 +144,7 @@
   command: mysql "-e show databases like '{{ db_user2 }}';"
   register: result
 
-- name: assert database does not exist   
+- name: assert database does not exist
   assert: { that: "'{{ db_user2 }}' not in result.stdout" }
 
 # ============================================================
@@ -153,7 +153,7 @@
   register: result
   ignore_errors: true
 
-- name: assert output message that database was not deleted using dbuser2 
+- name: assert output message that database was not deleted using dbuser2
   assert:
     that:
        - "result.failed == true"
@@ -163,7 +163,7 @@
   command: mysql "-e show databases like '{{ db_user1 }}';"
   register: result
 
-- name: assert database still exist 
+- name: assert database still exist
   assert: { that: "'{{ db_user1 }}' in result.stdout" }
 
 # ============================================================
@@ -179,7 +179,7 @@
   command: mysql "-e show databases like '{{ db_name }}';"
   register: result
 
-- name: assert database does not exist   
+- name: assert database does not exist
   assert: { that: "'{{ db_user1 }}' not in result.stdout" }
 
 # ============================================================
@@ -188,11 +188,3 @@
 - include: state_dump_import.yml format_type=gz  file=dbdata.gz format_msg_type=gzip
 
 - include: state_dump_import.yml format_type=bz2 file=dbdata.bz2 format_msg_type=bzip2
-  
-
-
-
-
-
-
-
diff --git a/test/integration/targets/mysql_db/tasks/state_dump_import.yml b/test/integration/targets/mysql_db/tasks/state_dump_import.yml
index 44267e1edb..a17e91b569 100644
--- a/test/integration/targets/mysql_db/tasks/state_dump_import.yml
+++ b/test/integration/targets/mysql_db/tasks/state_dump_import.yml
@@ -19,7 +19,7 @@
 # ============================================================
 - set_fact: db_file_name="{{tmp_dir}}/{{file}}"
 
-- name: state dump/import - create database  
+- name: state dump/import - create database
   mysql_db: name={{ db_name }} state=present
 
 - name: state dump/import - create table employee
@@ -41,7 +41,7 @@
        - "result.changed == true"
        - "result.db =='{{ db_name }}'"
 
-- name: assert database was backup successfully  
+- name: assert database was backup successfully
   command: file {{ db_file_name }}
   register: result
 
@@ -55,14 +55,14 @@
   mysql_db: name={{ db_name }} state=import target={{ db_file_name }}
   register: result
 
-- name: assert output message restore the database 
+- name: assert output message restore the database
   assert: { that: "result.changed == true" }
 
-- name: select data from table employee 
+- name: select data from table employee
   command: mysql {{ db_name }} "-e select * from  employee;"
   register: result
 
-- name: assert data in database is from the restore database 
+- name: assert data in database is from the restore database
   assert:
     that:
        - "'47' in result.stdout"
@@ -71,5 +71,5 @@
 - name: remove database name
   mysql_db: name={{ db_name }} state=absent
 
-- name: remove file name 
+- name: remove file name
   file: name={{ db_file_name }}  state=absent
diff --git a/test/integration/targets/mysql_user/defaults/main.yml b/test/integration/targets/mysql_user/defaults/main.yml
index ff7503f8f0..1775a99cf6 100644
--- a/test/integration/targets/mysql_user/defaults/main.yml
+++ b/test/integration/targets/mysql_user/defaults/main.yml
@@ -7,10 +7,9 @@ user_name_2: 'db_user2'
 user_password_1: '12345'
 user_password_2: '98765'
 
-db_names: 
+db_names:
     - clientdb
     - employeedb
     - providerdb
 
 tmp_dir: '/tmp'
-
diff --git a/test/integration/targets/mysql_user/tasks/assert_no_user.yml b/test/integration/targets/mysql_user/tasks/assert_no_user.yml
index 4d4a411fe2..0031a6887b 100644
--- a/test/integration/targets/mysql_user/tasks/assert_no_user.yml
+++ b/test/integration/targets/mysql_user/tasks/assert_no_user.yml
@@ -1,4 +1,4 @@
-# test code to assert no mysql user 
+# test code to assert no mysql user
 # (c) 2014,  Wayne Rosario <wrosario@ansible.com>
 
 # This file is part of Ansible
@@ -17,9 +17,9 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 # ============================================================
-- name: run command to query for mysql user 
+- name: run command to query for mysql user
   command: mysql "-e SELECT User FROM mysql.user where user='{{ user_name }}';"
   register: result
 
-- name: assert mysql user is not present 
+- name: assert mysql user is not present
   assert: { that: "'{{ user_name }}' not in result.stdout" }
diff --git a/test/integration/targets/mysql_user/tasks/assert_user.yml b/test/integration/targets/mysql_user/tasks/assert_user.yml
index 7b35a1f350..9ac7cbff13 100644
--- a/test/integration/targets/mysql_user/tasks/assert_user.yml
+++ b/test/integration/targets/mysql_user/tasks/assert_user.yml
@@ -1,4 +1,4 @@
-# test code to assert mysql user 
+# test code to assert mysql user
 # (c) 2014,  Wayne Rosario <wrosario@ansible.com>
 
 # This file is part of Ansible
@@ -17,11 +17,11 @@
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
 # ============================================================
-- name: run command to query for mysql user 
+- name: run command to query for mysql user
   command: mysql "-e SELECT User FROM mysql.user where user='{{ user_name }}';"
   register: result
 
-- name: assert mysql user is present 
+- name: assert mysql user is present
   assert: { that: "'{{ user_name }}' in result.stdout" }
 
 - name: run command to show privileges for user (expect privileges in stdout)
@@ -29,6 +29,6 @@
   register: result
   when: priv is defined
 
-- name: assert user has giving privileges 
+- name: assert user has giving privileges
   assert: { that: "'GRANT {{priv}} ON *.*' in result.stdout" }
   when: priv is defined
diff --git a/test/integration/targets/mysql_user/tasks/create_user.yml b/test/integration/targets/mysql_user/tasks/create_user.yml
index e7b0d7a33b..9c4daf3e53 100644
--- a/test/integration/targets/mysql_user/tasks/create_user.yml
+++ b/test/integration/targets/mysql_user/tasks/create_user.yml
@@ -1,4 +1,4 @@
-# test code to create mysql user 
+# test code to create mysql user
 # (c) 2014,  Wayne Rosario <wrosario@ansible.com>
 
 # This file is part of Ansible
diff --git a/test/integration/targets/mysql_user/tasks/main.yml b/test/integration/targets/mysql_user/tasks/main.yml
index db6a74dc5c..7c6d8ed418 100644
--- a/test/integration/targets/mysql_user/tasks/main.yml
+++ b/test/integration/targets/mysql_user/tasks/main.yml
@@ -93,14 +93,14 @@
 # Assert user has access to multiple databases
 #
 - name: give users access to multiple databases
-  mysql_user: name={{ item[0]  }} priv={{ item[1] }}.*:ALL append_privs=yes password={{ user_password_1 }} 
+  mysql_user: name={{ item[0]  }} priv={{ item[1] }}.*:ALL append_privs=yes password={{ user_password_1 }}
   with_nested:
-    - [ '{{ user_name_1 }}' , '{{ user_name_2 }}']
+    - [ '{{ user_name_1 }}', '{{ user_name_2 }}']
     - "{{db_names}}"
 
 - name: show grants access for user1 on multiple database
   command: mysql "-e SHOW GRANTS FOR '{{ user_name_1 }}'@'localhost';"
-  register: result 
+  register: result
 
 - name: assert grant access for user1 on multiple database
   assert: { that: "'{{ item }}' in result.stdout" }
@@ -108,7 +108,7 @@
 
 - name: show grants access for user2 on multiple database
   command: mysql "-e SHOW GRANTS FOR '{{ user_name_2 }}'@'localhost';"
-  register: result 
+  register: result
 
 - name: assert grant access for user2 on multiple database
   assert: { that: "'{{ item }}' in result.stdout" }
@@ -150,7 +150,7 @@
 # Update user password for a user.
 # Assert the user password is updated and old password can no longer be used.
 #
-- include: user_password_update_test.yml 
+- include: user_password_update_test.yml
 
 # ============================================================
 # Assert create user with SELECT privileges, attempt to create database and update privileges to create database
@@ -171,10 +171,3 @@
 # Assert creating user with SELECT privileges, attempt to create database and append privileges to create database
 #
 - include: test_privs.yml current_privilege='INSERT,DELETE' current_append_privs=yes
-
-
-
-
-
-
-
diff --git a/test/integration/targets/mysql_variables/defaults/main.yml b/test/integration/targets/mysql_variables/defaults/main.yml
index 4683ee0d78..a53a9f6761 100644
--- a/test/integration/targets/mysql_variables/defaults/main.yml
+++ b/test/integration/targets/mysql_variables/defaults/main.yml
@@ -2,4 +2,3 @@
 # defaults file for test_mysql_variables
 user: 'user1'
 password: 'password1'
-
diff --git a/test/integration/targets/mysql_variables/tasks/assert_var.yml b/test/integration/targets/mysql_variables/tasks/assert_var.yml
index db7f3d188a..7a3e963463 100644
--- a/test/integration/targets/mysql_variables/tasks/assert_var.yml
+++ b/test/integration/targets/mysql_variables/tasks/assert_var.yml
@@ -19,10 +19,10 @@
 # ============================================================
 # Assert mysql variable name and value from mysql database
 #
-- name: assert output message changed value 
+- name: assert output message changed value
   assert: { that: "output.changed == {{changed}}" }
 
-- name: run mysql command to show variable 
+- name: run mysql command to show variable
   command: mysql "-e show variables like '{{var_name}}';"
   register: result
 
@@ -32,5 +32,3 @@
        - "result.changed == true"
        - "'{{var_name}}' in result.stdout"
        - "'{{var_value}}' in result.stdout"
-
-
diff --git a/test/integration/targets/mysql_variables/tasks/assert_var_output.yml b/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
index 6a321a6f83..7214fa27dd 100644
--- a/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
+++ b/test/integration/targets/mysql_variables/tasks/assert_var_output.yml
@@ -19,14 +19,14 @@
 # ============================================================
 # Assert output variable name/value match mysql variable name/value
 #
-- name: assert output message changed value 
+- name: assert output message changed value
   assert: { that: "output.changed == {{changed}}" }
 
 - set_fact:
      key_name: "{{var_name}}"
      key_value: "{{output.msg[0][0]}}"
 
-- name: run mysql command to show variable 
+- name: run mysql command to show variable
   command: mysql "-e show variables like '{{var_name}}';"
   register: result
 
diff --git a/test/integration/targets/mysql_variables/tasks/main.yml b/test/integration/targets/mysql_variables/tasks/main.yml
index 26fc03c867..0ba23e8907 100644
--- a/test/integration/targets/mysql_variables/tasks/main.yml
+++ b/test/integration/targets/mysql_variables/tasks/main.yml
@@ -133,7 +133,7 @@
 
 # ============================================================
 # Verify mysql_variable fails when setting a read-only variable
-# 
+#
 - name: set value of a read only mysql variable
   mysql_variables: variable=character_set_system value=utf16
   register: result
@@ -199,4 +199,4 @@
   register: result
   ignore_errors: true
 
-- include: assert_fail_msg.yml output={{result}}  msg='unable to connect to database'
\ No newline at end of file
+- include: assert_fail_msg.yml output={{result}}  msg='unable to connect to database'
diff --git a/test/integration/targets/no_log/no_log_local.yml b/test/integration/targets/no_log/no_log_local.yml
index 87d76ff082..bf02468f22 100644
--- a/test/integration/targets/no_log/no_log_local.yml
+++ b/test/integration/targets/no_log/no_log_local.yml
@@ -63,4 +63,3 @@
       - name: args should be logged when task-level no_log overrides play-level
         shell: echo "LOG_ME_OVERRIDE"
         no_log: false
-
diff --git a/test/integration/targets/nxos_command/tasks/cli.yaml b/test/integration/targets/nxos_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/nxos_command/tasks/cli.yaml
+++ b/test/integration/targets/nxos_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_command/tasks/main.yaml b/test/integration/targets/nxos_command/tasks/main.yaml
index c4f8226584..4b0f8c64d9 100644
--- a/test/integration/targets/nxos_command/tasks/main.yaml
+++ b/test/integration/targets/nxos_command/tasks/main.yaml
@@ -1,5 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: nxapi.yaml, tags: ['nxapi'] }
-
-
diff --git a/test/integration/targets/nxos_command/tasks/nxapi.yaml b/test/integration/targets/nxos_command/tasks/nxapi.yaml
index 1f5dc70f2d..ea525379f7 100644
--- a/test/integration/targets/nxos_command/tasks/nxapi.yaml
+++ b/test/integration/targets/nxos_command/tasks/nxapi.yaml
@@ -26,5 +26,3 @@
     lines:
       - no feature nxapi
     provider: "{{ cli }}"
-
-
diff --git a/test/integration/targets/nxos_config/defaults/main.yaml b/test/integration/targets/nxos_config/defaults/main.yaml
index 2a4e223ff0..9ef5ba5165 100644
--- a/test/integration/targets/nxos_config/defaults/main.yaml
+++ b/test/integration/targets/nxos_config/defaults/main.yaml
@@ -1,4 +1,3 @@
 ---
 testcase: "*"
 test_items: []
-
diff --git a/test/integration/targets/nxos_config/tasks/cli.yaml b/test/integration/targets/nxos_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/nxos_config/tasks/cli.yaml
+++ b/test/integration/targets/nxos_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_config/tasks/main.yaml b/test/integration/targets/nxos_config/tasks/main.yaml
index a2f4b2415a..4b0f8c64d9 100644
--- a/test/integration/targets/nxos_config/tasks/main.yaml
+++ b/test/integration/targets/nxos_config/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: nxapi.yaml, tags: ['nxapi'] }
-
diff --git a/test/integration/targets/nxos_config/tasks/nxapi.yaml b/test/integration/targets/nxos_config/tasks/nxapi.yaml
index 1f5dc70f2d..ea525379f7 100644
--- a/test/integration/targets/nxos_config/tasks/nxapi.yaml
+++ b/test/integration/targets/nxos_config/tasks/nxapi.yaml
@@ -26,5 +26,3 @@
     lines:
       - no feature nxapi
     provider: "{{ cli }}"
-
-
diff --git a/test/integration/targets/nxos_facts/tasks/cli.yaml b/test/integration/targets/nxos_facts/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/nxos_facts/tasks/cli.yaml
+++ b/test/integration/targets/nxos_facts/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_facts/tasks/main.yaml b/test/integration/targets/nxos_facts/tasks/main.yaml
index a2f4b2415a..4b0f8c64d9 100644
--- a/test/integration/targets/nxos_facts/tasks/main.yaml
+++ b/test/integration/targets/nxos_facts/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: nxapi.yaml, tags: ['nxapi'] }
-
diff --git a/test/integration/targets/nxos_facts/tasks/nxapi.yaml b/test/integration/targets/nxos_facts/tasks/nxapi.yaml
index 2dc93a0769..148d8d6486 100644
--- a/test/integration/targets/nxos_facts/tasks/nxapi.yaml
+++ b/test/integration/targets/nxos_facts/tasks/nxapi.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_nxapi/defaults/main.yaml b/test/integration/targets/nxos_nxapi/defaults/main.yaml
index 72860d74e5..5f709c5aac 100644
--- a/test/integration/targets/nxos_nxapi/defaults/main.yaml
+++ b/test/integration/targets/nxos_nxapi/defaults/main.yaml
@@ -1,3 +1,2 @@
 ---
 testcase: "*"
-
diff --git a/test/integration/targets/nxos_nxapi/tasks/cli.yaml b/test/integration/targets/nxos_nxapi/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/nxos_nxapi/tasks/cli.yaml
+++ b/test/integration/targets/nxos_nxapi/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_nxapi/tasks/main.yaml b/test/integration/targets/nxos_nxapi/tasks/main.yaml
index 97b1cee1ea..415c99d8b1 100644
--- a/test/integration/targets/nxos_nxapi/tasks/main.yaml
+++ b/test/integration/targets/nxos_nxapi/tasks/main.yaml
@@ -1,4 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
-
diff --git a/test/integration/targets/nxos_nxapi/tests/cli/enable.yaml b/test/integration/targets/nxos_nxapi/tests/cli/enable.yaml
index 57c2236727..3dc1399ac4 100644
--- a/test/integration/targets/nxos_nxapi/tests/cli/enable.yaml
+++ b/test/integration/targets/nxos_nxapi/tests/cli/enable.yaml
@@ -36,4 +36,3 @@
 
 
 - debug: msg="END cli/enable.yaml"
-
diff --git a/test/integration/targets/nxos_template/defaults/main.yaml b/test/integration/targets/nxos_template/defaults/main.yaml
index 2a4e223ff0..9ef5ba5165 100644
--- a/test/integration/targets/nxos_template/defaults/main.yaml
+++ b/test/integration/targets/nxos_template/defaults/main.yaml
@@ -1,4 +1,3 @@
 ---
 testcase: "*"
 test_items: []
-
diff --git a/test/integration/targets/nxos_template/tasks/cli.yaml b/test/integration/targets/nxos_template/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/nxos_template/tasks/cli.yaml
+++ b/test/integration/targets/nxos_template/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/nxos_template/tasks/main.yaml b/test/integration/targets/nxos_template/tasks/main.yaml
index a2f4b2415a..4b0f8c64d9 100644
--- a/test/integration/targets/nxos_template/tasks/main.yaml
+++ b/test/integration/targets/nxos_template/tasks/main.yaml
@@ -1,4 +1,3 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
 - { include: nxapi.yaml, tags: ['nxapi'] }
-
diff --git a/test/integration/targets/nxos_template/tasks/nxapi.yaml b/test/integration/targets/nxos_template/tasks/nxapi.yaml
index 7c69bbc92c..ea525379f7 100644
--- a/test/integration/targets/nxos_template/tasks/nxapi.yaml
+++ b/test/integration/targets/nxos_template/tasks/nxapi.yaml
@@ -26,4 +26,3 @@
     lines:
       - no feature nxapi
     provider: "{{ cli }}"
-
diff --git a/test/integration/targets/ops_command/tasks/cli.yaml b/test/integration/targets/ops_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/ops_command/tasks/cli.yaml
+++ b/test/integration/targets/ops_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/ops_command/tasks/main.yaml b/test/integration/targets/ops_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/ops_command/tasks/main.yaml
+++ b/test/integration/targets/ops_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/parsing/bad_parsing.yml b/test/integration/targets/parsing/bad_parsing.yml
index 110b2903ec..953ec072ae 100644
--- a/test/integration/targets/parsing/bad_parsing.yml
+++ b/test/integration/targets/parsing/bad_parsing.yml
@@ -5,8 +5,8 @@
 
   gather_facts: False
 
-  roles: 
+  roles:
 
     # this one has a lot of things that should fail, see makefile for operation w/ tags
 
-    - { role: test_bad_parsing } 
+    - { role: test_bad_parsing }
diff --git a/test/integration/targets/parsing/good_parsing.yml b/test/integration/targets/parsing/good_parsing.yml
index 8fc8d88ec9..b68d91120b 100644
--- a/test/integration/targets/parsing/good_parsing.yml
+++ b/test/integration/targets/parsing/good_parsing.yml
@@ -5,5 +5,5 @@
 
   gather_facts: False
 
-  roles: 
+  roles:
     - { role: test_good_parsing, tags: test_good_parsing }
diff --git a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/main.yml b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/main.yml
index da8ad3d25b..43631b29a7 100644
--- a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/main.yml
+++ b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/main.yml
@@ -19,9 +19,9 @@
 # the following tests all raise errors, to use them in a Makefile, we run them with different flags, as
 # otherwise ansible stops at the first one and we want to ensure STOP conditions for each
 
-- set_fact: 
+- set_fact:
     test_file: "{{ output_dir }}/ansible_test_file"  # FIXME, use set tempdir
-    test_input: "owner=test" 
+    test_input: "owner=test"
     bad_var: "{{ output_dir }}' owner=test"
     chdir: "mom chdir=/tmp"
   tags: common
diff --git a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario1.yml b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario1.yml
index dab20be749..8a82fb95dd 100644
--- a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario1.yml
+++ b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario1.yml
@@ -2,4 +2,3 @@
   file: path={{ test_file }} {{ test_input }}
   failed_when: False # ignore the module, just test the parser
   tags: scenario1
-
diff --git a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario2.yml b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario2.yml
index 4f14f81b23..c3b4b13c1a 100644
--- a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario2.yml
+++ b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario2.yml
@@ -2,4 +2,3 @@
   file: path={{ test_file }} owner=test2 {{ test_input }}
   failed_when: False # ignore the module, just test the parser
   tags: scenario2
-
diff --git a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario3.yml b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario3.yml
index cd4da7baba..a228f70e21 100644
--- a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario3.yml
+++ b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario3.yml
@@ -2,4 +2,3 @@
   shell: echo hi {{ chdir }}
   failed_when: False
   tags: scenario3
-
diff --git a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario4.yml b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario4.yml
index 9ed1eae0b5..2845adca46 100644
--- a/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario4.yml
+++ b/test/integration/targets/parsing/roles/test_bad_parsing/tasks/scenario4.yml
@@ -2,4 +2,3 @@
   file: "name={{ bad_var }}"
   failed_when: False
   tags: scenario4
-
diff --git a/test/integration/targets/parsing/roles/test_good_parsing/tasks/main.yml b/test/integration/targets/parsing/roles/test_good_parsing/tasks/main.yml
index 418b6d4040..0fb1337e86 100644
--- a/test/integration/targets/parsing/roles/test_good_parsing/tasks/main.yml
+++ b/test/integration/targets/parsing/roles/test_good_parsing/tasks/main.yml
@@ -18,7 +18,7 @@
 
 # various tests of things that should not cause parsing problems
 
-- set_fact: 
+- set_fact:
     test_input: "a=1 a=2 a=3"
 
 - set_fact:
@@ -26,7 +26,7 @@
       echo old
       echo mcdonald
       echo had
-      echo a 
+      echo a
       echo farm
 
 - shell: echo "dog"
@@ -46,9 +46,9 @@
 - name: a quoted argument is not sent to the shell module as anything but a string parameter
   shell: echo 'dog' 'executable=/usr/bin/python'
   register: result
- 
+
 - debug: var=result.cmd
- 
+
 - assert:
     that:
        result.cmd == "echo 'dog' 'executable=/usr/bin/python'"
@@ -56,7 +56,7 @@
 - name: it is valid to pass multiple key=value arguments because the shell doesn't check key=value arguments
   shell: echo quackquack=here quackquack=everywhere
   register: result
- 
+
 - assert:
     that:
       result.cmd == 'echo quackquack=here quackquack=everywhere'
@@ -64,7 +64,7 @@
 - name: the same is true with quoting
   shell: echo "quackquack=here quackquack=everywhere"
   register: result
-     
+
 - assert:
     that:
       result.cmd == 'echo "quackquack=here quackquack=everywhere"'
@@ -85,9 +85,9 @@
   shell: echo {{ test_input }}
   register: result
 
-- assert: 
+- assert:
      that:
-        result.cmd == "echo a=1 a=2 a=3" 
+        result.cmd == "echo a=1 a=2 a=3"
 
 - name: more shell duplicates
   shell: echo foo=bar foo=bar
diff --git a/test/integration/targets/pip/meta/main.yml b/test/integration/targets/pip/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/pip/meta/main.yml
+++ b/test/integration/targets/pip/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/pip/tasks/pip.yml b/test/integration/targets/pip/tasks/pip.yml
index dc9bfb781e..658e4711b6 100644
--- a/test/integration/targets/pip/tasks/pip.yml
+++ b/test/integration/targets/pip/tasks/pip.yml
@@ -161,4 +161,3 @@
   assert:
     that:
       - "not q_check_mode.changed"
-
diff --git a/test/integration/targets/postgresql/defaults/main.yml b/test/integration/targets/postgresql/defaults/main.yml
index cfc50737c6..a78f817a63 100644
--- a/test/integration/targets/postgresql/defaults/main.yml
+++ b/test/integration/targets/postgresql/defaults/main.yml
@@ -5,4 +5,3 @@ db_user1: 'ansible_db_user1'
 db_user2: 'ansible_db_user2'
 
 tmp_dir: '/tmp'
-
diff --git a/test/integration/targets/postgresql/tasks/main.yml b/test/integration/targets/postgresql/tasks/main.yml
index 8949fe1efa..c9e0ec408c 100644
--- a/test/integration/targets/postgresql/tasks/main.yml
+++ b/test/integration/targets/postgresql/tasks/main.yml
@@ -879,4 +879,3 @@
 - assert:
     that:
       - "result.stdout_lines[-1] == '(0 rows)'"
-
diff --git a/test/integration/targets/prepare_win_tests/tasks/main.yml b/test/integration/targets/prepare_win_tests/tasks/main.yml
index 756c977fb1..e87b614b22 100644
--- a/test/integration/targets/prepare_win_tests/tasks/main.yml
+++ b/test/integration/targets/prepare_win_tests/tasks/main.yml
@@ -27,4 +27,3 @@
   win_file: name={{win_output_dir}} state=directory
   tags:
     - prepare
-
diff --git a/test/integration/targets/script/meta/main.yml b/test/integration/targets/script/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/script/meta/main.yml
+++ b/test/integration/targets/script/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/service/tasks/systemd_cleanup.yml b/test/integration/targets/service/tasks/systemd_cleanup.yml
index 10a60b216c..e0707265dc 100644
--- a/test/integration/targets/service/tasks/systemd_cleanup.yml
+++ b/test/integration/targets/service/tasks/systemd_cleanup.yml
@@ -23,4 +23,3 @@
   assert:
     that:
     - "restart_systemd_result.rc == 0"
-
diff --git a/test/integration/targets/service/tasks/sysv_cleanup.yml b/test/integration/targets/service/tasks/sysv_cleanup.yml
index b42744391b..dbdfcf8b49 100644
--- a/test/integration/targets/service/tasks/sysv_cleanup.yml
+++ b/test/integration/targets/service/tasks/sysv_cleanup.yml
@@ -7,4 +7,3 @@
     that:
     - "remove_sysv_result.path == '/etc/init.d/ansible_test'"
     - "remove_sysv_result.state == 'absent'"
-
diff --git a/test/integration/targets/service/tasks/sysv_setup.yml b/test/integration/targets/service/tasks/sysv_setup.yml
index 796a2fe9a7..c8bbbbc219 100644
--- a/test/integration/targets/service/tasks/sysv_setup.yml
+++ b/test/integration/targets/service/tasks/sysv_setup.yml
@@ -9,4 +9,3 @@
     - "install_sysv_result.state == 'file'"
     - "install_sysv_result.mode == '0755'"
     - "install_sysv_result.checksum == '174fa255735064b420600e4c8637ea0eff28d0c1'"
-
diff --git a/test/integration/targets/setup_mysql_db/defaults/main.yml b/test/integration/targets/setup_mysql_db/defaults/main.yml
index 744d0118d1..8394890159 100644
--- a/test/integration/targets/setup_mysql_db/defaults/main.yml
+++ b/test/integration/targets/setup_mysql_db/defaults/main.yml
@@ -1,6 +1,6 @@
 mysql_service: mysqld
 
-mysql_packages: 
+mysql_packages:
     - mysql-server
     - MySQL-python
     - bzip2
diff --git a/test/integration/targets/setup_mysql_db/vars/Debian.yml b/test/integration/targets/setup_mysql_db/vars/Debian.yml
index 21dfaad23a..9029e55061 100644
--- a/test/integration/targets/setup_mysql_db/vars/Debian.yml
+++ b/test/integration/targets/setup_mysql_db/vars/Debian.yml
@@ -1,6 +1,6 @@
 mysql_service: 'mysql'
 
-mysql_packages: 
+mysql_packages:
     - mysql-server
     - python-mysqldb
     - bzip2
diff --git a/test/integration/targets/setup_mysql_db/vars/RedHat.yml b/test/integration/targets/setup_mysql_db/vars/RedHat.yml
index 0c2e2b7d7c..742c35225b 100644
--- a/test/integration/targets/setup_mysql_db/vars/RedHat.yml
+++ b/test/integration/targets/setup_mysql_db/vars/RedHat.yml
@@ -1,6 +1,6 @@
 mysql_service: 'mysqld'
 
-mysql_packages: 
+mysql_packages:
     - mysql-server
     - MySQL-python
-    - bzip2
\ No newline at end of file
+    - bzip2
diff --git a/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
index b2507c9849..b29242914f 100644
--- a/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
+++ b/test/integration/targets/setup_postgresql_db/vars/Ubuntu-12.yml
@@ -8,4 +8,3 @@ postgresql_packages:
 pg_hba_location: "/etc/postgresql/9.1/main/pg_hba.conf"
 pg_dir: "/var/lib/postgresql/9.1/main"
 pg_ver: 9.1
-
diff --git a/test/integration/targets/special_vars/meta/main.yml b/test/integration/targets/special_vars/meta/main.yml
index a8b63dfdf2..07faa21776 100644
--- a/test/integration/targets/special_vars/meta/main.yml
+++ b/test/integration/targets/special_vars/meta/main.yml
@@ -1,3 +1,2 @@
 dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/stat/meta/main.yml b/test/integration/targets/stat/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/stat/meta/main.yml
+++ b/test/integration/targets/stat/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/stat/tasks/main.yml b/test/integration/targets/stat/tasks/main.yml
index 72bc1cac15..c1b21f0a36 100644
--- a/test/integration/targets/stat/tasks/main.yml
+++ b/test/integration/targets/stat/tasks/main.yml
@@ -167,4 +167,3 @@
     that:
       - "stat_result.stat.md5 == '5eb63bbbe01eeed093cb22bb8f5acdc3'"
   when: ansible_fips|bool != True
-
diff --git a/test/integration/targets/subversion/meta/main.yml b/test/integration/targets/subversion/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/subversion/meta/main.yml
+++ b/test/integration/targets/subversion/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/subversion/tasks/main.yml b/test/integration/targets/subversion/tasks/main.yml
index d15d63ab02..3f89c236eb 100644
--- a/test/integration/targets/subversion/tasks/main.yml
+++ b/test/integration/targets/subversion/tasks/main.yml
@@ -116,4 +116,3 @@
       - "subverted4.changed"
 
 # TBA: test for additional options or URL variants welcome
-
diff --git a/test/integration/targets/synchronize/meta/main.yml b/test/integration/targets/synchronize/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/synchronize/meta/main.yml
+++ b/test/integration/targets/synchronize/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/synchronize/tasks/main.yml b/test/integration/targets/synchronize/tasks/main.yml
index 483367047d..64857823ef 100644
--- a/test/integration/targets/synchronize/tasks/main.yml
+++ b/test/integration/targets/synchronize/tasks/main.yml
@@ -187,4 +187,3 @@
         - "'msg' in sync_result"
         - "sync_result.msg.startswith('>f+')"
         - "sync_result.msg.endswith('+ foo.txt\n')"
-
diff --git a/test/integration/targets/tags/test_tags.yml b/test/integration/targets/tags/test_tags.yml
index d450de7b39..f7e0467fe7 100644
--- a/test/integration/targets/tags/test_tags.yml
+++ b/test/integration/targets/tags/test_tags.yml
@@ -20,4 +20,3 @@
       - press
     - name: Task_without_tag
       debug: msg=
-
diff --git a/test/integration/targets/task_ordering/tasks/main.yml b/test/integration/targets/task_ordering/tasks/main.yml
index edd1890a90..281b837078 100644
--- a/test/integration/targets/task_ordering/tasks/main.yml
+++ b/test/integration/targets/task_ordering/tasks/main.yml
@@ -10,4 +10,3 @@
     that: lookup('file', temppath.stdout) == "one.1.two.1.three.1.four.1.one.2.two.2.three.2.four.2.one.3.two.3.three.3.four.3."
 
 - file: path="{{temppath.stdout}}" state=absent
-
diff --git a/test/integration/targets/template/meta/main.yml b/test/integration/targets/template/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/template/meta/main.yml
+++ b/test/integration/targets/template/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/template/vars/main.yml b/test/integration/targets/template/vars/main.yml
index 16776cb7e8..d811e17e3d 100644
--- a/test/integration/targets/template/vars/main.yml
+++ b/test/integration/targets/template/vars/main.yml
@@ -13,4 +13,3 @@ templated_dict:
   null_type: "{{ null_type }}"
   bool: "{{ bool_var }}"
   multi_part: "{{ part_1 }}{{ part_2 }}"
-
diff --git a/test/integration/targets/templating_settings/test_templating_settings.yml b/test/integration/targets/templating_settings/test_templating_settings.yml
index 524b869e63..d00300bdc2 100644
--- a/test/integration/targets/templating_settings/test_templating_settings.yml
+++ b/test/integration/targets/templating_settings/test_templating_settings.yml
@@ -13,4 +13,3 @@
   # name goes through templating correctly
     - name: 'Task: {{ a_list | to_json }}'
       debug: msg='{{ a_list | to_json }}'
-
diff --git a/test/integration/targets/test_infra/test_test_infra.yml b/test/integration/targets/test_infra/test_test_infra.yml
index 13c570530a..706f9b8fca 100644
--- a/test/integration/targets/test_infra/test_test_infra.yml
+++ b/test/integration/targets/test_infra/test_test_infra.yml
@@ -23,4 +23,3 @@
   - name: EXPECTED FAILURE ensure fail action stops execution
     fail:
       msg: fail actually failed (this is expected)
-
diff --git a/test/integration/targets/unarchive/meta/main.yml b/test/integration/targets/unarchive/meta/main.yml
index 1050c23ce3..07faa21776 100644
--- a/test/integration/targets/unarchive/meta/main.yml
+++ b/test/integration/targets/unarchive/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_tests
-
diff --git a/test/integration/targets/var_precedence/test_var_precedence.yml b/test/integration/targets/var_precedence/test_var_precedence.yml
index df09914158..58584bfb3e 100644
--- a/test/integration/targets/var_precedence/test_var_precedence.yml
+++ b/test/integration/targets/var_precedence/test_var_precedence.yml
@@ -42,4 +42,3 @@
   roles:
     - role: test_var_precedence_inven_override
       foo: bar
-
diff --git a/test/integration/targets/vault/roles/test_vault/tasks/main.yml b/test/integration/targets/vault/roles/test_vault/tasks/main.yml
index 2c18e41815..4e5551d9c3 100644
--- a/test/integration/targets/vault/roles/test_vault/tasks/main.yml
+++ b/test/integration/targets/vault/roles/test_vault/tasks/main.yml
@@ -1,4 +1,3 @@
-
 - assert:
     that:
       - 'secret_var == "secret"'
diff --git a/test/integration/targets/vault/roles/test_vault_embedded/tasks/main.yml b/test/integration/targets/vault/roles/test_vault_embedded/tasks/main.yml
index 4dda2acbcd..eba938966d 100644
--- a/test/integration/targets/vault/roles/test_vault_embedded/tasks/main.yml
+++ b/test/integration/targets/vault/roles/test_vault_embedded/tasks/main.yml
@@ -11,4 +11,3 @@
 
 # TODO: add a expected fail here
 # - debug: var=vault_encrypted_one_line_var_with_embedded_template
-
diff --git a/test/integration/targets/vyos_command/tasks/cli.yaml b/test/integration/targets/vyos_command/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/vyos_command/tasks/cli.yaml
+++ b/test/integration/targets/vyos_command/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/vyos_command/tasks/main.yaml b/test/integration/targets/vyos_command/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/vyos_command/tasks/main.yaml
+++ b/test/integration/targets/vyos_command/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/vyos_config/tasks/cli.yaml b/test/integration/targets/vyos_config/tasks/cli.yaml
index b916410f16..d675462dd0 100644
--- a/test/integration/targets/vyos_config/tasks/cli.yaml
+++ b/test/integration/targets/vyos_config/tasks/cli.yaml
@@ -13,5 +13,3 @@
   with_items: "{{ test_items }}"
   loop_control:
     loop_var: test_case_to_run
-
-
diff --git a/test/integration/targets/vyos_config/tasks/main.yaml b/test/integration/targets/vyos_config/tasks/main.yaml
index aea4ecccf1..415c99d8b1 100644
--- a/test/integration/targets/vyos_config/tasks/main.yaml
+++ b/test/integration/targets/vyos_config/tasks/main.yaml
@@ -1,3 +1,2 @@
 ---
 - { include: cli.yaml, tags: ['cli'] }
-
diff --git a/test/integration/targets/win_copy/meta/main.yml b/test/integration/targets/win_copy/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_copy/meta/main.yml
+++ b/test/integration/targets/win_copy/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_copy/tasks/main.yml b/test/integration/targets/win_copy/tasks/main.yml
index f23ebf6350..fcfa82c238 100644
--- a/test/integration/targets/win_copy/tasks/main.yml
+++ b/test/integration/targets/win_copy/tasks/main.yml
@@ -57,7 +57,7 @@
 - name: initiate a basic copy
 #- name: initiate a basic copy, and also test the mode
 #  win_copy: src=foo.txt dest={{output_file}} mode=0444
-  win_copy: src=foo.txt dest={{output_file}} 
+  win_copy: src=foo.txt dest={{output_file}}
   register: copy_result
 
 - debug: var=copy_result
@@ -76,8 +76,8 @@
 #      - "file_result_check.mode == '0444'"
 
 - name: assert basic copy worked
-  assert: 
-    that: 
+  assert:
+    that:
       - "'changed' in copy_result"
 #      - "'dest' in copy_result"
 #      - "'group' in copy_result"
@@ -95,8 +95,8 @@
       - "copy_result.changed == true"
 
 - name: verify that the file checksum is correct
-  assert: 
-    that: 
+  assert:
+    that:
       - "copy_result.checksum == 'c79a6506c1c948be0d456ab5104d5e753ab2f3e6'"
 
 - name: check the stat results of the file
@@ -106,7 +106,7 @@
 - debug: var=stat_results
 
 - name: assert the stat results are correct
-  assert: 
+  assert:
     that:
       - "stat_results.stat.exists == true"
 #      - "stat_results.stat.isblk == false"
@@ -120,8 +120,8 @@
   register: copy_result2
 
 - name: assert that the file was not changed
-  assert: 
-    that: 
+  assert:
+    that:
       - "not copy_result2|changed"
 
 # content system not available in win_copy right now
@@ -130,8 +130,8 @@
 #  register: copy_result3
 #
 #- name: assert that the file has changed
-#  assert: 
-#     that: 
+#  assert:
+#     that:
 #       - "copy_result3|changed"
 #       - "'content' not in copy_result3"
 
@@ -155,7 +155,7 @@
   register: stat_bar
 
 - name: check that a file in a deeper directory was transferred
-  win_stat: path={{win_output_dir}}/sub/subdir/subdir2/baz.txt 
+  win_stat: path={{win_output_dir}}/sub/subdir/subdir2/baz.txt
   register: stat_bar2
 
 - name: check that a file in a directory whose parent contains a directory alone was transferred
@@ -191,9 +191,9 @@
 
 # content param not available in win_copy
 #- name: overwrite the file again using the content system, also passing along file params
-#  win_copy: content="modified" dest={{output_file}} 
+#  win_copy: content="modified" dest={{output_file}}
 #  register: copy_result4
-  
+
 #- name: assert invalid copy input location fails
 #  win_copy: src=invalid_file_location_does_not_exist dest={{win_output_dir}}/file.txt
 #  ignore_errors: True
@@ -292,5 +292,3 @@
 
 - name: clean up foo.txt
   win_file: path={{win_output_dir}}/foo.txt state=absent
-
-
diff --git a/test/integration/targets/win_file/meta/main.yml b/test/integration/targets/win_file/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_file/meta/main.yml
+++ b/test/integration/targets/win_file/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_file/tasks/main.yml b/test/integration/targets/win_file/tasks/main.yml
index 674a18f357..7eeb97d023 100644
--- a/test/integration/targets/win_file/tasks/main.yml
+++ b/test/integration/targets/win_file/tasks/main.yml
@@ -447,11 +447,11 @@
   win_file: path={{win_output_dir}}/dirtest state=absent
   register: file_result
 
-- name: stat the removed directory 
+- name: stat the removed directory
   win_stat: path={{win_output_dir}}/dirtest
   register: stat_result
 
-- name: assert the directory does not exist 
+- name: assert the directory does not exist
   assert:
     that:
        - file_result.changed
@@ -461,7 +461,7 @@
   win_file: path="{{win_output_dir}}/dir with spaces (and parens)" state=directory
   register: file_result
 
-- name: stat the directory with spaces and parens 
+- name: stat the directory with spaces and parens
   win_stat: path="{{win_output_dir}}/dir with spaces (and parens)"
   register: stat_result
 
@@ -491,4 +491,3 @@
 
 - name: clean up sub2
   win_file: path={{win_output_dir}}/sub2 state=absent
-
diff --git a/test/integration/targets/win_get_url/tasks/main.yml b/test/integration/targets/win_get_url/tasks/main.yml
index 52e49672d2..17482fcd4c 100644
--- a/test/integration/targets/win_get_url/tasks/main.yml
+++ b/test/integration/targets/win_get_url/tasks/main.yml
@@ -36,7 +36,7 @@
   register: win_get_url_result
 
 - name: check that url was downloaded
-  assert: 
+  assert:
     that:
       - "not win_get_url_result|failed"
       - "win_get_url_result|changed"
@@ -50,7 +50,7 @@
   register: win_get_url_result_again
 
 - name: check that url was downloaded again
-  assert: 
+  assert:
     that:
       - "not win_get_url_result_again|failed"
       - "win_get_url_result_again|changed"
@@ -63,7 +63,7 @@
   register: win_get_url_result_noforce
 
 - name: check that url was not downloaded again
-  assert: 
+  assert:
     that:
       - "not win_get_url_result_noforce|failed"
       - "not win_get_url_result_noforce|changed"
@@ -76,7 +76,7 @@
   ignore_errors: true
 
 - name: check that the download failed for an invalid url
-  assert: 
+  assert:
     that:
       - "win_get_url_result_invalid_link|failed"
 
@@ -88,7 +88,7 @@
   ignore_errors: true
 
 - name: check that the download failed for an invalid path
-  assert: 
+  assert:
     that:
       - "win_get_url_result_invalid_path|failed"
 
@@ -100,6 +100,6 @@
   ignore_errors: true
 
 - name: check that the download failed if dest is a directory
-  assert: 
+  assert:
     that:
       - "win_get_url_result_dir_path|failed"
diff --git a/test/integration/targets/win_lineinfile/meta/main.yml b/test/integration/targets/win_lineinfile/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_lineinfile/meta/main.yml
+++ b/test/integration/targets/win_lineinfile/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_lineinfile/tasks/main.yml b/test/integration/targets/win_lineinfile/tasks/main.yml
index 45d0ae96a5..48c465f256 100644
--- a/test/integration/targets/win_lineinfile/tasks/main.yml
+++ b/test/integration/targets/win_lineinfile/tasks/main.yml
@@ -30,7 +30,7 @@
   register: result
 
 - name: check win_stat file result
-  assert: 
+  assert:
     that:
       - "result.stat.exists"
       - "not result.stat.isdir"
@@ -638,4 +638,3 @@
   assert:
     that:
     - "result.stat.checksum == '66a72e71f42c4775f4326da95cfe82c8830e5022'"
-
diff --git a/test/integration/targets/win_ping/tasks/main.yml b/test/integration/targets/win_ping/tasks/main.yml
index aa5d03c908..132453b904 100644
--- a/test/integration/targets/win_ping/tasks/main.yml
+++ b/test/integration/targets/win_ping/tasks/main.yml
@@ -22,7 +22,7 @@
 
 - name: check win_ping result
   assert:
-    that: 
+    that:
       - "not win_ping_result|failed"
       - "not win_ping_result|changed"
       - "win_ping_result.ping == 'pong'"
@@ -45,7 +45,7 @@
 
 - name: check win_ping.ps1 result with data
   assert:
-    that: 
+    that:
       - "not win_ping_ps1_result|failed"
       - "not win_ping_ps1_result|changed"
       - "win_ping_ps1_result.ping == 'bleep'"
diff --git a/test/integration/targets/win_regedit/meta/main.yml b/test/integration/targets/win_regedit/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_regedit/meta/main.yml
+++ b/test/integration/targets/win_regedit/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_regmerge/meta/main.yml b/test/integration/targets/win_regmerge/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_regmerge/meta/main.yml
+++ b/test/integration/targets/win_regmerge/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_regmerge/tasks/main.yml b/test/integration/targets/win_regmerge/tasks/main.yml
index 6e64c9dd4a..fde2e4d998 100644
--- a/test/integration/targets/win_regmerge/tasks/main.yml
+++ b/test/integration/targets/win_regmerge/tasks/main.yml
@@ -31,7 +31,7 @@
      - settings3.reg
 
 # test 1 -  basic test of changed behaviour
-# merge in REG_SZ 
+# merge in REG_SZ
 - name: test 1 merge in a setting
   win_regmerge:
      path: "{{win_output_dir}}\\settings1.reg"
diff --git a/test/integration/targets/win_setup/tasks/main.yml b/test/integration/targets/win_setup/tasks/main.yml
index 123eaeffe2..f409aa482c 100644
--- a/test/integration/targets/win_setup/tasks/main.yml
+++ b/test/integration/targets/win_setup/tasks/main.yml
@@ -21,7 +21,7 @@
   register: setup_result
 
 - name: check windows setup result
-  assert: 
+  assert:
     that:
       - "not setup_result|failed"
       - "not setup_result|changed"
@@ -51,7 +51,7 @@
       - "setup_result.ansible_facts.ansible_powershell_version"
 
 - name: check setup result only when using https
-  assert: 
+  assert:
     that:
       - "setup_result.ansible_facts.ansible_win_rm_certificate_expires"
   when: ansible_ssh_port|default(5986) != 5985
diff --git a/test/integration/targets/win_stat/tasks/main.yml b/test/integration/targets/win_stat/tasks/main.yml
index 5197c27fef..56553d4d75 100644
--- a/test/integration/targets/win_stat/tasks/main.yml
+++ b/test/integration/targets/win_stat/tasks/main.yml
@@ -21,7 +21,7 @@
   register: win_stat_file
 
 - name: check win_stat file result
-  assert: 
+  assert:
     that:
       - "win_stat_file.stat.exists"
       - "not win_stat_file.stat.isdir"
@@ -41,7 +41,7 @@
   register: win_stat_file_no_md5
 
 - name: check win_stat file result without md5
-  assert: 
+  assert:
     that:
       - "win_stat_file_no_md5.stat.exists"
       - "not win_stat_file_no_md5.stat.isdir"
@@ -61,7 +61,7 @@
   register: win_stat_dir
 
 - name: check win_stat dir result
-  assert: 
+  assert:
     that:
       - "win_stat_dir.stat.exists"
       - "win_stat_dir.stat.isdir"
@@ -79,7 +79,7 @@
   register: win_stat_missing
 
 - name: check win_stat missing result
-  assert: 
+  assert:
     that:
       - "not win_stat_missing.stat.exists"
       - "not win_stat_missing|failed"
diff --git a/test/integration/targets/win_template/meta/main.yml b/test/integration/targets/win_template/meta/main.yml
index 55200b3fc6..d328716dfa 100644
--- a/test/integration/targets/win_template/meta/main.yml
+++ b/test/integration/targets/win_template/meta/main.yml
@@ -1,3 +1,2 @@
-dependencies: 
+dependencies:
   - prepare_win_tests
-
diff --git a/test/integration/targets/win_template/tasks/main.yml b/test/integration/targets/win_template/tasks/main.yml
index c276b8d323..6004007fc2 100644
--- a/test/integration/targets/win_template/tasks/main.yml
+++ b/test/integration/targets/win_template/tasks/main.yml
@@ -21,22 +21,22 @@
   win_template: src=foo.j2 dest={{win_output_dir}}/foo.templated
   register: template_result
 
-- assert: 
-    that: 
-        - "'changed' in template_result" 
-#        - "'dest' in template_result" 
-#        - "'group' in template_result" 
-#        - "'gid' in template_result" 
-#        - "'checksum' in template_result" 
-#        - "'owner' in template_result" 
-#        - "'size' in template_result" 
-#        - "'src' in template_result" 
-#        - "'state' in template_result" 
-#        - "'uid' in template_result" 
+- assert:
+    that:
+        - "'changed' in template_result"
+#        - "'dest' in template_result"
+#        - "'group' in template_result"
+#        - "'gid' in template_result"
+#        - "'checksum' in template_result"
+#        - "'owner' in template_result"
+#        - "'size' in template_result"
+#        - "'src' in template_result"
+#        - "'state' in template_result"
+#        - "'uid' in template_result"
 
 - name: verify that the file was marked as changed
-  assert: 
-    that: 
+  assert:
+    that:
       - "template_result.changed == true"
 
 - name: fill in a basic template again
@@ -46,9 +46,9 @@
   register: template_result2
 
 - name: verify that the template was not changed
-  assert: 
-    that: 
-      - "not template_result2|changed" 
+  assert:
+    that:
+      - "not template_result2|changed"
 
 # VERIFY CONTENTS
 
@@ -56,17 +56,17 @@
   win_copy: src=foo.txt dest={{win_output_dir}}\\foo.txt
 
 - name: compare templated file to known good
-  raw: fc.exe {{win_output_dir}}\\foo.templated {{win_output_dir}}\\foo.txt 
+  raw: fc.exe {{win_output_dir}}\\foo.templated {{win_output_dir}}\\foo.txt
   register: diff_result
 
 - debug: var=diff_result
 
 - name: verify templated file matches known good
-  assert:  
-    that: 
-#        - 'diff_result.stdout == ""' 
+  assert:
+    that:
+#        - 'diff_result.stdout == ""'
         - 'diff_result.stdout_lines[1] == "FC: no differences encountered"'
-        - "diff_result.rc == 0" 
+        - "diff_result.rc == 0"
 
 # VERIFY MODE
 # can't set file mode on windows so commenting this test out
diff --git a/test/integration/targets/yum/tasks/main.yml b/test/integration/targets/yum/tasks/main.yml
index 41ce38f7c8..209362d44e 100644
--- a/test/integration/targets/yum/tasks/main.yml
+++ b/test/integration/targets/yum/tasks/main.yml
@@ -20,4 +20,3 @@
 # We want to test that for people who don't want to upgrade their systems.
 - include: 'yum.yml'
   when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora'] and ansible_python.version.major == 2
-
diff --git a/test/integration/targets/zypper/tasks/main.yml b/test/integration/targets/zypper/tasks/main.yml
index f2ad3cdce0..905b5ddcfd 100644
--- a/test/integration/targets/zypper/tasks/main.yml
+++ b/test/integration/targets/zypper/tasks/main.yml
@@ -23,4 +23,3 @@
 
 - include: 'zypper.yml'
   when: ansible_os_family == 'Suse'
-
diff --git a/test/integration/targets/zypper_repository/tasks/main.yml b/test/integration/targets/zypper_repository/tasks/main.yml
index b2c4f754b9..a1fb69d22c 100644
--- a/test/integration/targets/zypper_repository/tasks/main.yml
+++ b/test/integration/targets/zypper_repository/tasks/main.yml
@@ -19,4 +19,3 @@
 
 - include: 'zypper_repository.yml'
   when: ansible_os_family == 'Suse'
-
diff --git a/test/samples/ignore_errors.yml b/test/samples/ignore_errors.yml
index 5845d049c4..ff6488f739 100644
--- a/test/samples/ignore_errors.yml
+++ b/test/samples/ignore_errors.yml
@@ -7,4 +7,3 @@
   - debug: msg="you should still see this"
   - fail:
   - debug: msg="you should NOT see this"
-  
diff --git a/test/samples/include.yml b/test/samples/include.yml
index ae62b79bb0..ca2bcca8da 100644
--- a/test/samples/include.yml
+++ b/test/samples/include.yml
@@ -3,4 +3,3 @@
   - included
 #- debug: msg="this is the second debug in the include"
 - debug: msg="this is the third debug in the include, and a is still {{a}}"
-
diff --git a/test/samples/l1_include.yml b/test/samples/l1_include.yml
index 39438a63fe..6003df99fb 100644
--- a/test/samples/l1_include.yml
+++ b/test/samples/l1_include.yml
@@ -1,3 +1,2 @@
 - debug: msg="this is the l1 include"
 - include: common_include.yml
-
diff --git a/test/samples/l2_include.yml b/test/samples/l2_include.yml
index ae931631e6..fb29683a62 100644
--- a/test/samples/l2_include.yml
+++ b/test/samples/l2_include.yml
@@ -1,4 +1,3 @@
 - debug: msg="this is the l2 include"
 - debug: msg="a second task for l2"
 - include: common_include.yml
-
diff --git a/test/samples/localhost_include.yml b/test/samples/localhost_include.yml
index eca8b5716c..05ce4edc2e 100644
--- a/test/samples/localhost_include.yml
+++ b/test/samples/localhost_include.yml
@@ -1,3 +1,2 @@
 - debug: msg="this is the localhost include"
 - include: common_include.yml
-
diff --git a/test/samples/lookup_template.yml b/test/samples/lookup_template.yml
index 8fdd981b9f..b8db342e2c 100644
--- a/test/samples/lookup_template.yml
+++ b/test/samples/lookup_template.yml
@@ -4,4 +4,3 @@
     my_var: "Bazinga!"
   tasks:
   - debug: msg="the rendered template is {{ lookup('template', 'template.j2') }}"
-
diff --git a/test/samples/test_include.yml b/test/samples/test_include.yml
index 60befd9911..97407b13b2 100644
--- a/test/samples/test_include.yml
+++ b/test/samples/test_include.yml
@@ -22,4 +22,3 @@
   #handlers:
   #- name: foo
   #  include: include.yml a="this is a handler"
-
diff --git a/test/samples/test_pb.yml b/test/samples/test_pb.yml
index ab5b7ab295..c2e8208708 100644
--- a/test/samples/test_pb.yml
+++ b/test/samples/test_pb.yml
@@ -39,4 +39,3 @@
     debug: msg="this is the foo handler"
   - name: bar
     debug: msg="this is the bar handler, you should not see this"
-
diff --git a/test/samples/test_roles_complex.yml b/test/samples/test_roles_complex.yml
index 8359dd2bc7..4665c4ca8a 100644
--- a/test/samples/test_roles_complex.yml
+++ b/test/samples/test_roles_complex.yml
@@ -3,4 +3,3 @@
   roles:
   - { role: role_a, tags: A, when: skip != "A" }
   - { role: role_b, tags: B, when: skip != "B" }
-
diff --git a/test/samples/with_together.yml b/test/samples/with_together.yml
index 073b801033..d511f15c2e 100644
--- a/test/samples/with_together.yml
+++ b/test/samples/with_together.yml
@@ -3,7 +3,7 @@
   gather_facts: no
   vars:
     alpha: [ 'a', 'b', 'c', 'd' ]
-    numbers:  [ 1, 2, 3, 4 ]
+    numbers: [ 1, 2, 3, 4 ]
   tasks:
   - debug: msg="{{ item.0 }} and {{ item.1 }}"
     with_together:
diff --git a/test/utils/ansible-playbook_integration_runner/ec2.yml b/test/utils/ansible-playbook_integration_runner/ec2.yml
index 55619776d9..387b0c7e8d 100644
--- a/test/utils/ansible-playbook_integration_runner/ec2.yml
+++ b/test/utils/ansible-playbook_integration_runner/ec2.yml
@@ -38,4 +38,3 @@
     ec2_vars: "{{ ec2.results[item.0]['instances'][0] }}"
     ec2_instance_ids: "{{ ec2.results[item.0]['instance_ids'] }}"
   with_indexed_items: slaves
-
diff --git a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/meta/main.yml b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/meta/main.yml
index 07c15d619e..47e181bb68 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/meta/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/meta/main.yml
@@ -20,4 +20,3 @@ galaxy_info:
     - ansible
     - dependencies
 dependencies: []
-  
diff --git a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/tasks/main.yml b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/tasks/main.yml
index 832138527f..3ca58c6e5d 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/tasks/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/tasks/main.yml
@@ -98,5 +98,3 @@
   sudo: true
   lineinfile: "dest=/etc/sudoers regexp='^Defaults[ ,       ]*requiretty'  line='#Defaults    requiretty'"
   when: ansible_os_family == 'RedHat'
-
-
diff --git a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
index b66d699d5d..5410c1f29c 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/roles/ansible_test_deps/test/main.yml
@@ -26,4 +26,3 @@
         dest: "{{ git_dir }}"
     - name: Invoke ansible in hacking mode
       shell: "cd {{ git_dir }} && . hacking/env-setup && ansible --version && ansible-playbook --version"
-
diff --git a/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml b/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml
index a833c96558..f214949c4b 100644
--- a/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml
+++ b/test/utils/ansible-playbook_integration_runner/roles/run_integration/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 - name: Sync ansible repo to ec2 instance
-  synchronize: 
+  synchronize:
     src: "{{ sync_dir }}/"
     dest: "~/ansible"
   no_log: true