From f5edc06be0d8bedeb0904b348ba5e3e67c74f186 Mon Sep 17 00:00:00 2001
From: "Lovett, Trevor (tl2972)" <tl2972@att.com>
Date: Wed, 22 Aug 2018 11:13:45 -0500
Subject: [VVP] Added new three new reports

Resolves VVP-81 by introducing three new reports to the validation
script output.

Each report is written to the output directory under ice_validator.

* mapping_errors.csv - each row represents an issue where a test is
                       mapped to a requirement that does not exist
                       in the requirement.json file
* traceability.csv   - Shows a mapping between all test cases and
                       requirements.  Rows will also be shown
                       where a requirement does not have a tests, and
                       where tests are not mapped to a requirement
* report.{html|csv|xlsx} - Formatted error report that shows each
                           failure that was detected and maps it to
                           a the file name, requirement(s) violated if
                           known, possible resolution steps, error
                           message, and raw output from pytest.  The
                           report can be written in html, csv, or Excel
                           format

Other minor changes:
* Replaced smart quotes with regular quotes to resolve issues with py3
* Updated copyright of modified files
* Fixed Flake-8 errors

Issue-ID: VVP-81

Change-Id: I659836cb20262ae44652c03639281a817dd051ae
Signed-off-by: Lovett, Trevor (tl2972) <tl2972@att.com>
---
 ice_validator/tests/__init__.py                    |   6 +-
 ice_validator/tests/conftest.py                    | 539 +++++++++++++++++++--
 .../fail/mismatch_get_resource.yaml                |   4 +-
 .../fail/mismatch_get_resource_volume.yaml         |   4 +-
 .../fail/mismatch_resource_id.yaml                 |   4 +-
 .../fail/mismatch_resource_id_volume.yaml          |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../pass/valid_template_volume.yaml                |   4 +-
 .../invalid_naming_for_allowed_address_pairs.yaml  |   4 +-
 .../fail/single_ip_format_used_in_array.yaml       |   4 +-
 .../fail/wrong_network_role.yaml                   |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 ...al_network_network_role_wrong_in_parameter.yaml |   4 +-
 ...xternal_network_vm_type_wrong_in_parameter.yaml |   4 +-
 ...al_network_network_role_wrong_in_parameter.yaml |   4 +-
 ...nternal_network_vm_type_wrong_in_parameter.yaml |   4 +-
 .../fail/mismatch_vm_type_exernal_nova_server.yaml |   4 +-
 .../mismatch_vm_type_internal_nova_server.yaml     |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../fail/missing_increment.yaml                    |   4 +-
 .../fail/not_starting_with_availability_zone.yaml  |   4 +-
 .../fail/using_list_instead_of_get_param.yaml      |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/not_using_get_param.yaml                  |   4 +-
 .../fail/only_specifying_param.yaml                |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/failing_directory/check_cant_fail.yaml    |  36 +-
 .../pass/base_well_named_1/base_well_named.yaml    |  36 +-
 .../pass/base_well_named_2/well_base_named.yaml    |  36 +-
 .../pass/base_well_named_3/well_named_base.yaml    |  36 +-
 .../fail/base_template.yaml                        |   4 +-
 ...dule_1_template_missing_output_consumption.yaml |   4 +-
 .../fail/module_2_child_1_template.yaml            |   4 +-
 ...dule_2_template_missing_output_consumption.yaml |   4 +-
 .../pass/base_template.yaml                        |   4 +-
 .../pass/module_1_template.yaml                    |   4 +-
 .../pass/module_2_child_1_template.yaml            |   4 +-
 .../pass/module_2_template.yaml                    |   4 +-
 .../match_environment_filename_slightly_lon.yaml   |  10 +-
 .../match_environment_filename_slightly_long.env   |  10 +-
 .../match_environment_filename_slightly_shor.env   |  10 +-
 .../match_environment_filename_slightly_short.yaml |  10 +-
 .../no_match/no_match_environment_filename.env     |  10 +-
 .../pass/good_matches/good_yaml_eg.env             |  10 +-
 .../pass/good_matches/good_yaml_eg.yaml            |  10 +-
 .../fail/base_template.yaml                        |   4 +-
 .../fail/base_template_env.yaml                    |   4 +-
 .../test_env_files_provided/pass/base_template.env |   4 +-
 .../pass/base_template.yaml                        |   4 +-
 .../fail/non_environment_invalid_key.env           |   4 +-
 .../fail/non_environment_no_keys.env               |  10 +-
 .../pass/environment.env                           |   4 +-
 .../fail/invalid_naming_for_fixed_ips.yaml         |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/get_param_not_used_for_fixed_ips.yaml     |   4 +-
 .../fail/get_resource_used_for_fixed_ips.yaml      |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../external_mismatch_vm_type_nova_server.yaml     |   4 +-
 .../fail/external_wrong_network_role_param.yaml    |   4 +-
 .../fail/external_wrong_vm_type_param.yaml         |   4 +-
 .../internal_mismatch_vm_type_nova_server.yaml     |   4 +-
 .../fail/internal_wrong_network_role_param.yaml    |   4 +-
 .../fail/internal_wrong_vm_type_param.yaml         |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../fail/personality_contains_http.yaml            |   4 +-
 .../fail/user_data_contains_ftp.yaml               |   4 +-
 .../fail/user_data_contains_http.yaml              |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 ...arameter_numeric_value_missing_constraints.yaml |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/env_missing_yaml.env                      |   4 +-
 .../fail/misnamed_pair.yaml                        |   4 +-
 .../fail/misnamed_pairr.env                        |   4 +-
 .../fail/yaml_missing_env.yaml                     |   4 +-
 .../test_heat_pairs_provided/pass/good_yaml_eg.env |   4 +-
 .../pass/good_yaml_eg.yaml                         |   4 +-
 .../pass/good_yaml_eg_volume.env                   |   4 +-
 .../pass/good_yaml_eg_volume.yaml                  |   4 +-
 .../fail/parameter_default_value_specified.yaml    |   4 +-
 .../fail/parameter_invalid_keys.yaml               |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/environment.yaml                          |   4 +-
 .../fail/valid_heat_template.env                   |   4 +-
 .../pass/environment.env                           |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../pass/valid_heat_template.yml                   |   4 +-
 .../fail/template_missing_description.yaml         |   4 +-
 .../fail/template_missing_type.yaml                |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../fail/non_heat_template_invalid_keys.yaml       |   4 +-
 .../fail/non_heat_template_invalid_keys.yml        |   4 +-
 .../fail/non_heat_template_no_valid_keys.yaml      |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../pass/valid_heat_template.yml                   |   4 +-
 .../pass/valid_heat_template_minimal_sections.yaml |   4 +-
 .../fail/base_template.env                         |   4 +-
 .../fail/base_template.template                    |   4 +-
 .../pass/base_template.env                         |   4 +-
 .../pass/base_template.yaml                        |   4 +-
 .../fail/heat_template_missing_nested_files.yaml   |   4 +-
 .../pass/nested_template_1.yaml                    |   4 +-
 .../pass/nested_template_2.yaml                    |   4 +-
 .../pass/valid_nested_heat_template.yaml           |   4 +-
 .../fail/heat_template_invalid_nesting.yaml        |   4 +-
 .../pass/nested_template_1.yaml                    |   4 +-
 .../pass/nested_template_2.yaml                    |   4 +-
 .../pass/valid_nested_heat_template.yaml           |   4 +-
 .../pass/valid_non_nested_template.yaml            |   4 +-
 .../fail/invalid_naming_used_for_network.yaml      |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/get_param_not_used_for_network.yaml       |   4 +-
 .../get_resource_used_for_external_network.yaml    |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/unused_param.env                          |  14 +-
 .../fail/unused_param.yaml                         |  56 +--
 .../pass/no_unused_param.env                       |  12 +-
 .../pass/no_unused_param.yaml                      |  52 +-
 .../fail/not_supported_policies.yml                |   4 +-
 .../pass/with_supported_policies.yml               |   4 +-
 .../fail/wrong_type_for_parameters.yaml            |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/mismatch_vm_type_key_properties.yaml      |   4 +-
 .../mismatch_vm_type_key_properties_uppercase.yaml |   4 +-
 .../fail/mismatch_vm_type_resource_id.yaml         |   4 +-
 .../mismatch_vm_type_resource_id_uppercase.yaml    |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/inconsistent_vm_type.yaml                 |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/missing_get_param.yaml                    |   4 +-
 .../using_str_replace_instead_of_get_param.yaml    |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/bad_yaml_less_indent_on_value.yaml        |  28 +-
 .../test_parse_yaml/fail/bad_yaml_multierror.yaml  |  30 +-
 .../test_parse_yaml/fail/bad_yaml_tab.yaml         |  28 +-
 .../fail/bad_yaml_value_and_keys.yaml              |  28 +-
 .../test_parse_yaml/pass/good_yaml_eg.yaml         |  26 +-
 .../mismatch_vm_type_port_id_get_resource.yaml     |   4 +-
 ..._port_attached_to_nova_server_get_resource.yaml |   4 +-
 ...ched_to_nova_server_get_resource_uppercase.yaml |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../fail/missing_param_definition_1.yaml           |   4 +-
 .../fail/missing_param_definition_2.yaml           |   4 +-
 .../fail/missing_param_reference_1.yaml            |   4 +-
 ...ms_referenced_are_defined_and_vice_versa_1.yaml |   4 +-
 ...ms_referenced_are_defined_and_vice_versa_2.yaml |   4 +-
 ...plate_required_parameters_with_constraints.yaml |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../missing_required_parameters_in_env_file.env    |   4 +-
 .../missing_required_parameters_in_env_file.yaml   |   4 +-
 .../pass/required_parameters_specified.env         |   4 +-
 .../pass/required_parameters_specified.yaml        |   4 +-
 .../required_parameters_specified_not_needed.env   |   4 +-
 .../required_parameters_specified_not_needed.yaml  |   4 +-
 .../missing_required_parameters_in_template.yaml   |   4 +-
 .../pass/required_parameters_specified.yaml        |   4 +-
 .../required_parameters_specified_not_needed.yaml  |   4 +-
 .../invalid_characters_in_resource_id_template.yml |   4 +-
 .../valid_characters_in_resource_id_template.yml   |   4 +-
 ...template_missing_specified_vf_module_index.yaml |   4 +-
 .../template_missing_specified_vf_module_name.yaml |   4 +-
 ...te_missing_specified_vf_module_name_in_rsg.yaml |   4 +-
 .../pass/valid_heat_template_1.yaml                |   4 +-
 .../pass/valid_heat_template_2.yaml                |   4 +-
 .../pass/valid_heat_template_3.yaml                |   4 +-
 .../pass/valid_heat_template_4.yaml                |   4 +-
 .../fail/missing_vf_module_id.yaml                 |   4 +-
 .../fail/missing_vnf_id.yaml                       |   4 +-
 .../fail/missing_vnf_name.yaml                     |   4 +-
 .../pass/has_required_metadata.yaml                |   4 +-
 .../fail/missing_metadata_section.yaml             |   4 +-
 .../fail/missing_properties_section.yaml           |   4 +-
 .../fail/not_using_get_param.yaml                  |   4 +-
 .../pass/has_required_metadata.yaml                |   4 +-
 .../invalid_naming_used_for_get_param_subnet.yaml  |   4 +-
 ...nvalid_naming_used_for_get_resource_subnet.yaml |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/get_param_not_used_for_subnet.yaml        |   4 +-
 .../get_resource_used_for_external_network.yaml    |   4 +-
 .../pass/valid_heat_template.yaml                  |   4 +-
 .../fail/heat_template_1.yaml                      |   4 +-
 ...at_template_2_identical_to_heat_template_2.yaml |   4 +-
 .../pass/unique_resource_template_1.yml            |   4 +-
 .../pass/unique_resource_template_2.yml            |   4 +-
 ...ource_stack_name_without_vnf_name_or_module.yml |   4 +-
 .../pass/unique_resource_template.yml              |   4 +-
 ...ource_stack_name_without_vnf_name_or_module.yml |   4 +-
 .../pass/unique_resource_template.yml              |   4 +-
 .../fail/duplicate_resource_template.yml           |   4 +-
 .../fail/unique_resource_template.yml              |   4 +-
 .../pass/unique_resource_template_1.yml            |   4 +-
 .../pass/unique_resource_template_2.yml            |   4 +-
 .../fail/duplicate_resource_template.yml           |   4 +-
 .../pass/unique_resource_template.yml              |   4 +-
 .../fail/no_value_volume.yaml                      |   4 +-
 .../fail/use_get_param_volume.yml                  |   4 +-
 .../pass/valid_template_volume.yml                 |   4 +-
 .../fail/more_outputs_than_parameters.yaml         |   4 +-
 .../fail/more_outputs_than_parameters_volume.yaml  |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../pass/valid_template_volume.yaml                |   4 +-
 ...ch_vm_type_instance_uuid_volume_attachment.yaml |   4 +-
 .../mismatch_vm_type_volume_id_nova_server_id.yaml |   4 +-
 .../fail/mismatch_vm_type_volume_id_param.yaml     |   4 +-
 .../fail/mismatch_vm_type_volume_id_resource.yaml  |   4 +-
 ...smatch_vm_type_volume_id_volume_attachment.yaml |   4 +-
 ...type_volume_id_volume_attachment_uppercase.yaml |   4 +-
 .../pass/valid_template.yaml                       |   4 +-
 .../fail/badly_named_volume_1.yaml                 |   4 +-
 .../fail/missing_keyword.yaml                      |   4 +-
 .../fail/only_nova_severs_in_volume.yaml           |   4 +-
 .../pass/well_named_volume.yaml                    |   4 +-
 .../fail/missing_outputs_volume.yaml               |   4 +-
 .../pass/well_named_volume.yaml                    |   4 +-
 ...smatch_resource_keys_outputs_keys_1_volume.yaml |   4 +-
 ...smatch_resource_keys_outputs_keys_2_volume.yaml |   4 +-
 ...smatch_resource_keys_outputs_keys_3_volume.yaml |   4 +-
 .../fail/more_outputs_than_resources_volume.yaml   |   4 +-
 .../fail/more_resources_than_outputs_volume.yaml   |   4 +-
 .../pass/valid_template_volume.yaml                |   4 +-
 ice_validator/tests/parametrizers.py               | 445 ++++++++---------
 ice_validator/tests/structures.py                  |  31 +-
 .../tests/test_all_referenced_resources_exists.py  |  18 +-
 .../tests/test_allowed_address_pair_format.py      | 136 ++++--
 ...d_address_pairs_include_vm_type_network_role.py |  24 +-
 ice_validator/tests/test_availability_zone.py      |  20 +-
 .../tests/test_availability_zone_get_param.py      |   6 +-
 ice_validator/tests/test_base_template_names.py    |   6 +-
 .../tests/test_base_template_outputs_consumed.py   |  29 +-
 .../tests/test_cloud_config_resource_id.py         |  32 +-
 ice_validator/tests/test_env_and_yaml_same_name.py |  24 +-
 .../tests/test_env_no_resource_registry.py         |  19 +-
 .../tests/test_environment_file_structure.py       |  64 ++-
 ice_validator/tests/test_fixed_ips_format.py       |  43 +-
 .../tests/test_fixed_ips_format_use_get_param.py   |  10 +-
 .../test_fixed_ips_include_vm_type_network_role.py |   6 +-
 .../test_get_file_only_reference_local_files.py    |   6 +-
 .../tests/test_heat_numeric_parameters.py          |   6 +-
 ice_validator/tests/test_heat_pairs_provided.py    |   6 +-
 ice_validator/tests/test_heat_parameter_section.py |  38 +-
 .../test_heat_template_and_env_file_extension.py   |   6 +-
 ..._template_parameters_contain_required_fields.py |   6 +-
 .../tests/test_heat_template_structure.py          |  32 +-
 .../tests/test_heat_templates_provided.py          |   6 +-
 .../tests/test_multipart_mime_resource_id.py       |  32 +-
 ice_validator/tests/test_nested_templates.py       |  24 +-
 .../tests/test_nested_templates_invalid_nesting.py |  12 +-
 ice_validator/tests/test_network_format.py         |   9 +-
 ...network_format_use_get_param_or_get_resource.py |   6 +-
 ..._unused_parameters_between_env_and_templates.py |   6 +-
 .../tests/test_nova_servergroup_policies.py        |   6 +-
 .../test_nova_servers_correct_parameter_types.py   |  24 +-
 ice_validator/tests/test_nova_servers_index.py     |  38 +-
 .../tests/test_nova_servers_resource_ids.py        |  14 +-
 ice_validator/tests/test_nova_servers_vm_types.py  |   6 +-
 .../test_nova_servers_vm_types_use_get_param.py    |   6 +-
 ice_validator/tests/test_parse_yaml.py             |   6 +-
 ice_validator/tests/test_port_resource_ids.py      |  80 +--
 ...test_referenced_and_defined_parameters_match.py |   6 +-
 .../test_required_parameters_no_constraints.py     |   6 +-
 ...t_required_parameters_specified_in_env_files.py |   6 +-
 ...uired_parameters_specified_in_heat_templates.py |   6 +-
 .../tests/test_reserve_port_fixed_ips_format.py    |  18 +-
 .../tests/test_resource_ids_alphanumeric_only.py   |   6 +-
 .../tests/test_servers_have_optional_metadata.py   |   6 +-
 .../tests/test_servers_have_required_metadata.py   |   6 +-
 .../tests/test_servers_metadata_use_get_param.py   |   6 +-
 ice_validator/tests/test_subnet_format.py          |  33 +-
 ..._subnet_format_use_get_param_or_get_resource.py |   6 +-
 ice_validator/tests/test_unique_name_resources.py  |   6 +-
 ...t_unique_name_str_replace_use_params_in_tmpl.py |   6 +-
 .../test_unique_name_str_replace_use_req_params.py |   6 +-
 .../test_unique_resources_across_all_templates.py  |   6 +-
 .../tests/test_unique_resources_across_template.py |   6 +-
 ice_validator/tests/test_vm_type_resource_id.py    |   5 +-
 ice_validator/tests/test_volume_format_outputs.py  |   6 +-
 .../tests/test_volume_outputs_consumed.py          |   6 +-
 ice_validator/tests/test_volume_resource_ids.py    |  63 ++-
 ice_validator/tests/test_volume_templates.py       |   6 +-
 .../tests/test_volume_templates_outputs.py         |   6 +-
 .../test_volume_templates_outputs_resources.py     |   6 +-
 ice_validator/tests/utils/__init__.py              |   6 +-
 ice_validator/tests/utils/nested_files.py          |  50 +-
 ice_validator/tests/utils/network_roles.py         |  82 ++--
 ice_validator/tests/utils/ports.py                 | 176 ++++---
 ice_validator/tests/utils/vm_types.py              |  34 +-
 285 files changed, 2083 insertions(+), 1613 deletions(-)

(limited to 'ice_validator/tests')

diff --git a/ice_validator/tests/__init__.py b/ice_validator/tests/__init__.py
index e8f24cd..ec11176 100644
--- a/ice_validator/tests/__init__.py
+++ b/ice_validator/tests/__init__.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/conftest.py b/ice_validator/tests/conftest.py
index 84429cf..09baa9a 100644
--- a/ice_validator/tests/conftest.py
+++ b/ice_validator/tests/conftest.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -34,29 +34,377 @@
 # limitations under the License.
 #
 # ============LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
 
+import collections
+import csv
+import datetime
+import hashlib
+import io
+import json
 import os
+import sys
+import time
 
+import docutils.core
+import pytest
+from more_itertools import partition
+from six import string_types
+import xlsxwriter
 
 __path__ = [os.path.dirname(os.path.abspath(__file__))]
 
+resolution_steps_file = "resolution_steps.json"
+requirements_file = "requirements.json"
+
+FAILURE_DATA = {}
+
+report_columns = [
+    ("Input File", "file"),
+    ("Test", "test_file"),
+    ("Requirements", "req_description"),
+    ("Resolution Steps", "resolution_steps"),
+    ("Error Message", "message"),
+    ("Raw Test Output", "raw_output"),
+]
+report = collections.OrderedDict(report_columns)
+
+
+def extract_error_msg(rep):
+    msg = str(rep.longrepr.reprcrash)
+    if "AssertionError:" in msg:
+        return msg.split("AssertionError:")[1]
+    else:
+        return msg
+
+
+@pytest.hookimpl(tryfirst=True, hookwrapper=True)
+def pytest_runtest_makereport(item, call):
+
+    outcome = yield
+    rep = outcome.get_result()
+
+    output_dir = "{}/../output".format(__path__[0])
+    if rep.outcome == "failed":
+        if not os.path.exists(output_dir):
+            os.mkdir(output_dir)
+
+        if hasattr(item.function, "requirement_ids"):
+            requirement_ids = item.function.requirement_ids
+        else:
+            requirement_ids = ""
+
+        if "environment_pair" in item.fixturenames:
+            resolved_pair = "{} environment pair".format(
+                item.funcargs["environment_pair"]["name"]
+            )
+        elif "heat_volume_pair" in item.fixturenames:
+            resolved_pair = "{} volume pair".format(
+                item.funcargs["heat_volume_pair"]["name"]
+            )
+        elif "heat_templates" in item.fixturenames:
+            resolved_pair = item.funcargs["heat_templates"]
+        elif "yaml_files" in item.fixturenames:
+            resolved_pair = item.funcargs["yaml_files"]
+        else:
+            resolved_pair = rep.nodeid.split("[")[1][:-1]
+
+        FAILURE_DATA[len(FAILURE_DATA)] = {
+            "file": resolved_pair,
+            "vnfrqts": requirement_ids,
+            "test": item.function.__name__,
+            "test_file": item.function.__module__.split(".")[-1],
+            "raw_output": str(rep.longrepr),
+            "message": extract_error_msg(rep),
+        }
+
+        with open("{}/failures".format(output_dir), "w") as f:
+            json.dump(FAILURE_DATA, f, indent=4)
+
+
+def make_timestamp():
+    timezone = time.tzname[time.localtime().tm_isdst]
+    return "{} {}".format(str(datetime.datetime.now()), timezone)
+
+
+def pytest_sessionfinish(session, exitstatus):
+    if not session.config.option.template_dir:
+        return
+    template_path = os.path.abspath(session.config.option.template_dir[0])
+    profile_name = session.config.option.validation_profile_name
+    generate_report(
+        "{}/../output".format(__path__[0]),
+        template_path,
+        profile_name,
+        session.config.option.report_format,
+    )
+
+
+def pytest_runtest_setup(item):
+    profile = item.session.config.option.validation_profile
+    markers = set(m.name for m in item.iter_markers())
+    if not profile and markers:
+        pytest.skip("No validation profile selected. Skipping tests with marks.")
+    if profile and markers and profile not in markers:
+        pytest.skip("Doesn't match selection validation profile")
+
+
+def make_href(path):
+    paths = [path] if isinstance(path, string_types) else path
+    links = []
+    for p in paths:
+        abs_path = os.path.abspath(p)
+        filename = os.path.split(abs_path)[1]
+        links.append(
+            "<a href='file://{abs_path}' target='_blank'>{filename}</a>".format(
+                abs_path=abs_path, filename=filename
+            )
+        )
+    return "<br/>".join(links)
+
+
+def generate_report(outpath, template_path, profile_name, output_format):
+    failures = "{}/failures".format(outpath)
+    faildata = None
+    rdata = None
+    hdata = None
+
+    if os.path.exists(failures):
+        with open(failures, "r") as f:
+            faildata = json.loads(f.read())
+    else:
+        faildata = {}
+
+    resolution_steps = "{}/../{}".format(__path__[0], resolution_steps_file)
+    if os.path.exists(resolution_steps):
+        with open(resolution_steps, "r") as f:
+            rdata = json.loads(f.read())
+
+    heat_requirements = "{}/../{}".format(__path__[0], requirements_file)
+    if os.path.exists(heat_requirements):
+        with open(heat_requirements, "r") as f:
+            hdata = json.loads(f.read())
+
+    # point requirements at the most recent version
+    current_version = hdata["current_version"]
+    hdata = hdata["versions"][current_version]["needs"]
+    # mapping requirement IDs from failures to requirement descriptions
+    for k, v in faildata.items():
+        req_text = ""
+        if v["vnfrqts"] != "":
+            for req in v["vnfrqts"]:
+                if req in hdata:
+                    req_text += "\n\n{}: \n{}".format(req, hdata[req]["description"])
+        faildata[k]["req_description"] = req_text
+
+    # mapping resolution steps to module and test name
+    for k, v in faildata.items():
+        faildata[k]["resolution_steps"] = ""
+        for rs in rdata:
+            if v["test_file"] == rs["module"] and v["test"] == rs["function"]:
+                faildata[k]["resolution_steps"] = "\n{}: \n{}".format(
+                    rs["header"], rs["resolution_steps"]
+                )
+    output_format = output_format.lower().strip() if output_format else "html"
+    if output_format == "html":
+        generate_html_report(outpath, profile_name, template_path, faildata)
+    elif output_format == "excel":
+        generate_excel_report(outpath, profile_name, template_path, faildata)
+    elif output_format == "csv":
+        generate_csv_report(outpath, profile_name, template_path, faildata)
+    else:
+        raise ValueError("Unsupported output format: " + output_format)
+
+
+def generate_csv_report(output_dir, profile_name, template_path, faildata):
+    rows = []
+    rows.append(["Validation Failures"])
+    headers = [
+        ("Profile Selected:", profile_name),
+        ("Report Generated At:", make_timestamp()),
+        ("Directory Validated:", template_path),
+        ("Checksum:", hash_directory(template_path)),
+        ("Total Errors:", len(faildata)),
+    ]
+
+    rows.append([])
+    for header in headers:
+        rows.append(header)
+    rows.append([])
+
+    # table header
+    rows.append([col for col, _ in report_columns])
+
+    # table content
+    for data in faildata.values():
+        rows.append(
+            [
+                data.get("file", ""),
+                data.get("test_file", ""),
+                data.get("req_description", ""),
+                data.get("resolution_steps", ""),
+                data.get("message", ""),
+                data.get("raw_output", ""),
+            ]
+        )
+
+    output_path = os.path.join(output_dir, "report.csv")
+    with open(output_path, "w", newline="") as f:
+        writer = csv.writer(f)
+        for row in rows:
+            writer.writerow(row)
+
+
+def generate_excel_report(output_dir, profile_name, template_path, faildata):
+    output_path = os.path.join(output_dir, "report.xlsx")
+    workbook = xlsxwriter.Workbook(output_path)
+    bold = workbook.add_format({"bold": True})
+    code = workbook.add_format(({"font_name": "Courier", "text_wrap": True}))
+    normal = workbook.add_format({"text_wrap": True})
+    heading = workbook.add_format({"bold": True, "font_size": 18})
+    worksheet = workbook.add_worksheet("failures")
+    worksheet.write(0, 0, "Validation Failures", heading)
+
+    headers = [
+        ("Profile Selected:", profile_name),
+        ("Report Generated At:", make_timestamp()),
+        ("Directory Validated:", template_path),
+        ("Checksum:", hash_directory(template_path)),
+        ("Total Errors:", len(faildata)),
+    ]
+    for row, (header, value) in enumerate(headers, start=2):
+        worksheet.write(row, 0, header, bold)
+        worksheet.write(row, 1, value)
+
+    worksheet.set_column(0, len(headers) - 1, 40)
+    worksheet.set_column(len(headers), len(headers), 80)
+
+    # table header
+    start_error_table_row = 2 + len(headers) + 2
+    for col_num, (col_name, _) in enumerate(report_columns):
+        worksheet.write(start_error_table_row, col_num, col_name, bold)
+
+    # table content
+    for row, data in enumerate(faildata.values(), start=start_error_table_row + 1):
+        for col, key in enumerate(report.values()):
+            if key == "file":
+                paths = (
+                    [data[key]] if isinstance(data[key], string_types) else data[key]
+                )
+                contents = "\n".join(paths)
+                worksheet.write(row, col, contents, normal)
+            elif key == "raw_output":
+                worksheet.write_string(row, col, data[key], code)
+            else:
+                worksheet.write(row, col, data[key], normal)
+
+    workbook.close()
+
+
+def generate_html_report(outpath, profile_name, template_path, faildata):
+    with open("{}/report.html".format(outpath), "w") as of:
+        body_begin = """
+        <style type="text/css">
+        h1, li {{
+            font-family:Arial, sans-serif;
+        }}
+        .tg  {{border-collapse:collapse;border-spacing:0;}}
+        .tg td{{font-family:Arial, sans-serif;font-size:8px;padding:10px 5px;
+        border-style:solid;border-width:1px;overflow:hidden;word-break:normal;
+        border-color:black;}}
+        .tg th{{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;
+        padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;
+        word-break:normal;border-color:black;}}
+        .tg .tg-rwj1{{font-size:10px;font-family:Arial, Helvetica,
+        sans-serif !important;;border-color:inherit;vertical-align:top}}</style>
+        <h1>Validation Failures</h1>
+        <ul>
+            <li><b>Profile Selected: </b> <tt>{profile}</tt></li>
+            <li><b>Report Generated At:</b> <tt>{timestamp}</tt></li>
+            <li><b>Directory Validated:</b> <tt>{template_dir}</tt></li>
+            <li><b>Checksum:</b> <tt>{checksum}</tt></li>
+            <li><b>Total Errors:</b> {num_failures}</li>
+        </ul>
+        """.format(
+            profile=profile_name,
+            timestamp=make_timestamp(),
+            checksum=hash_directory(template_path),
+            template_dir=template_path,
+            num_failures=len(faildata),
+        )
+        of.write(body_begin)
+
+        if len(faildata) == 0:
+            of.write("<p>Success! No validation failures detected.</p>")
+            return
+
+        table_begin = '<table class="tg">'
+        of.write(table_begin)
+
+        # table headers
+        of.write("<tr>")
+        for k, v in report.items():
+            of.write('<th class="tg-rwj1">{}</th>'.format(k))
+        of.write("</tr>")
+
+        # table content
+        for k, v in faildata.items():
+            of.write("<tr>")
+            for rk, rv in report.items():
+                if rv == "file":
+                    value = make_href(v[rv])
+                elif rv == "raw_output":
+                    value = "<pre>{}</pre>".format(v[rv])
+                elif rv == "req_description":
+                    parts = docutils.core.publish_parts(
+                        writer_name="html", source=v[rv]
+                    )
+                    value = parts["body"]
+                else:
+                    value = v[rv].replace("\n", "<br />")
+                of.write("  <td>{}</td>".format(value))
+            of.write("</tr>")
+
+        of.write("</table>")
+
 
 def pytest_addoption(parser):
     """
     Add needed CLI arguments
     """
-    parser.addoption("--template-directory",
-                     dest="template_dir",
-                     action="append",
-                     help="Directory which holds the templates for validation")
+    parser.addoption(
+        "--template-directory",
+        dest="template_dir",
+        action="append",
+        help="Directory which holds the templates for validation",
+    )
+
+    parser.addoption(
+        "--self-test",
+        dest="self_test",
+        action="store_true",
+        help="Test the unit tests against their fixtured data",
+    )
+
+    parser.addoption(
+        "--validation-profile",
+        dest="validation_profile",
+        action="store",
+        help="Runs all unmarked tests plus test with a matching marker",
+    )
 
-    parser.addoption("--self-test",
-                     dest="self_test",
-                     action='store_true',
-                     help="Test the unit tests against their fixtured data")
+    parser.addoption(
+        "--validation-profile-name",
+        dest="validation_profile_name",
+        action="store",
+        help="Friendly name of the validation profile used in reports",
+    )
+
+    parser.addoption(
+        "--report-format",
+        dest="report_format",
+        action="store",
+        help="Format of output report (html, csv, excel)",
+    )
 
 
 def pytest_configure(config):
@@ -64,12 +412,14 @@ def pytest_configure(config):
     Ensure that we are receive either `--self-test` or
     `--template-dir=<directory` as CLI arguments
     """
-    if config.getoption('template_dir') and config.getoption('self_test'):
-        raise Exception(('"--template-dir", and "--self-test"'
-                        ' are mutually exclusive'))
-    if not (config.getoption('template_dir') or config.getoption('self_test')):
-        raise Exception(('One of "--template-dir" or'
-                        ' "--self-test" must be specified'))
+    if config.getoption("template_dir") and config.getoption("self_test"):
+        raise Exception('"--template-dir", and "--self-test"' " are mutually exclusive")
+    if not (
+        config.getoption("template_dir") or
+        config.getoption("self_test") or
+        config.getoption("help")
+    ):
+        raise Exception('One of "--template-dir" or' ' "--self-test" must be specified')
 
 
 def pytest_generate_tests(metafunc):
@@ -80,81 +430,180 @@ def pytest_generate_tests(metafunc):
     is not specified on the CLI, the fixtures associated with this
     test name.
     """
-    if 'filename' in metafunc.fixturenames:
+    if "filename" in metafunc.fixturenames:
         from .parametrizers import parametrize_filename
+
         parametrize_filename(metafunc)
 
-    if 'filenames' in metafunc.fixturenames:
+    if "filenames" in metafunc.fixturenames:
         from .parametrizers import parametrize_filenames
+
         parametrize_filenames(metafunc)
 
-    if 'template_dir' in metafunc.fixturenames:
+    if "template_dir" in metafunc.fixturenames:
         from .parametrizers import parametrize_template_dir
+
         parametrize_template_dir(metafunc)
 
-    if 'environment_pair' in metafunc.fixturenames:
+    if "environment_pair" in metafunc.fixturenames:
         from .parametrizers import parametrize_environment_pair
+
         parametrize_environment_pair(metafunc)
 
-    if 'heat_volume_pair' in metafunc.fixturenames:
+    if "heat_volume_pair" in metafunc.fixturenames:
         from .parametrizers import parametrize_heat_volume_pair
+
         parametrize_heat_volume_pair(metafunc)
 
-    if 'yaml_files' in metafunc.fixturenames:
+    if "yaml_files" in metafunc.fixturenames:
         from .parametrizers import parametrize_yaml_files
+
         parametrize_yaml_files(metafunc)
 
-    if 'env_files' in metafunc.fixturenames:
+    if "env_files" in metafunc.fixturenames:
         from .parametrizers import parametrize_environment_files
+
         parametrize_environment_files(metafunc)
 
-    if 'yaml_file' in metafunc.fixturenames:
+    if "yaml_file" in metafunc.fixturenames:
         from .parametrizers import parametrize_yaml_file
+
         parametrize_yaml_file(metafunc)
 
-    if 'env_file' in metafunc.fixturenames:
+    if "env_file" in metafunc.fixturenames:
         from .parametrizers import parametrize_environment_file
+
         parametrize_environment_file(metafunc)
 
-    if 'parsed_yaml_file' in metafunc.fixturenames:
+    if "parsed_yaml_file" in metafunc.fixturenames:
         from .parametrizers import parametrize_parsed_yaml_file
+
         parametrize_parsed_yaml_file(metafunc)
 
-    if 'parsed_environment_file' in metafunc.fixturenames:
+    if "parsed_environment_file" in metafunc.fixturenames:
         from .parametrizers import parametrize_parsed_environment_file
+
         parametrize_parsed_environment_file(metafunc)
 
-    if 'heat_template' in metafunc.fixturenames:
+    if "heat_template" in metafunc.fixturenames:
         from .parametrizers import parametrize_heat_template
+
         parametrize_heat_template(metafunc)
 
-    if 'heat_templates' in metafunc.fixturenames:
+    if "heat_templates" in metafunc.fixturenames:
         from .parametrizers import parametrize_heat_templates
+
         parametrize_heat_templates(metafunc)
 
-    if 'volume_template' in metafunc.fixturenames:
+    if "volume_template" in metafunc.fixturenames:
         from .parametrizers import parametrize_volume_template
+
         parametrize_volume_template(metafunc)
 
-    if 'volume_templates' in metafunc.fixturenames:
+    if "volume_templates" in metafunc.fixturenames:
         from .parametrizers import parametrize_volume_templates
+
         parametrize_volume_templates(metafunc)
 
-    if 'template' in metafunc.fixturenames:
+    if "template" in metafunc.fixturenames:
         from .parametrizers import parametrize_template
+
         parametrize_template(metafunc)
 
-    if 'templates' in metafunc.fixturenames:
+    if "templates" in metafunc.fixturenames:
         from .parametrizers import parametrize_templates
+
         parametrize_templates(metafunc)
 
 
+def hash_directory(path):
+    md5 = hashlib.md5()
+    for dir_path, sub_dirs, filenames in os.walk(path):
+        for filename in filenames:
+            file_path = os.path.join(dir_path, filename)
+            with open(file_path, "rb") as f:
+                md5.update(f.read())
+    return md5.hexdigest()
+
+
+def load_current_requirements():
+    """Loads dict of current requirements or empty dict if file doesn't exist"""
+    path = "requirements.json"
+    if not os.path.exists(path):
+        return {}
+    with io.open(path, encoding="utf8", mode="r") as f:
+        data = json.load(f)
+        version = data["current_version"]
+        return data["versions"][version]["needs"]
+
+
+def compat_open(path):
+    """Invokes open correctly depending on the Python version"""
+    if sys.version_info.major < 3:
+        return open(path, "wb")
+    else:
+        return open(path, "w", newline="")
+
+
+def unicode_writerow(writer, row):
+    if sys.version_info.major < 3:
+        row = [s.encode("utf8") for s in row]
+    writer.writerow(row)
+
+
 def pytest_report_collectionfinish(config, startdir, items):
-    """Generates a simple traceability report to sysout"""
-    print("Traceability Report")
-    print("==================================================================")
-    for item in items:
-        if hasattr(item.function, "requirement_ids"):
-            for req_id in item.function.requirement_ids:
-                print(req_id + "," + item.function.__module__ + ","
-                      + item.function.__name__)
+    """Generates a simple traceability report to output/traceability.csv"""
+    traceability_path = os.path.join(__path__[0], "../output/traceability.csv")
+    output_dir = os.path.split(traceability_path)[0]
+    if not os.path.exists(output_dir):
+        os.makedirs(output_dir)
+    requirements = load_current_requirements()
+    unmapped, mapped = partition(
+        lambda item: hasattr(item.function, "requirement_ids"), items
+    )
+
+    req_to_test = collections.defaultdict(set)
+    mapping_errors = set()
+    for item in mapped:
+        for req_id in item.function.requirement_ids:
+            req_to_test[req_id].add(item)
+            if req_id not in requirements:
+                mapping_errors.add(
+                    (req_id, item.function.__module__, item.function.__name__)
+                )
+
+    mapping_error_path = os.path.join(__path__[0], "../output/mapping_errors.csv")
+    with compat_open(mapping_error_path) as f:
+        writer = csv.writer(f)
+        for error in mapping_errors:
+            unicode_writerow(writer, error)
+
+    with compat_open(traceability_path) as f:
+        out = csv.writer(f)
+        unicode_writerow(
+            out,
+            ("Requirement ID", "Requirement", "Section", "Test Module", "Test Name"),
+        )
+        for req_id, metadata in requirements.items():
+            if req_to_test[req_id]:
+                for item in req_to_test[req_id]:
+                    unicode_writerow(
+                        out,
+                        (
+                            req_id,
+                            metadata["description"],
+                            metadata["section_name"],
+                            item.function.__module__,
+                            item.function.__name__,
+                        ),
+                    )
+            else:
+                unicode_writerow(
+                    out,
+                    (req_id, metadata["description"], metadata["section_name"], "", ""),
+                )
+        # now write out any test methods that weren't mapped to requirements
+        for item in unmapped:
+            unicode_writerow(
+                out, ("", "", "", item.function.__module__, item.function.__name__)
+            )
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource.yaml
index b11db06..d653198 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource_volume.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource_volume.yaml
index 4304a70..aa378f4 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource_volume.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_get_resource_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id.yaml
index bb6f22e..403506a 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id_volume.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id_volume.yaml
index 2078b2d..acf77b6 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id_volume.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/fail/mismatch_resource_id_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template.yaml
index 783553f..6295d0d 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template_volume.yaml b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template_volume.yaml
index 0d54d61..5f22853 100644
--- a/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template_volume.yaml
+++ b/ice_validator/tests/fixtures/test_all_referenced_resources_exists/pass/valid_template_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/invalid_naming_for_allowed_address_pairs.yaml b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/invalid_naming_for_allowed_address_pairs.yaml
index db42cf6..a1a5c15 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/invalid_naming_for_allowed_address_pairs.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/invalid_naming_for_allowed_address_pairs.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/single_ip_format_used_in_array.yaml b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/single_ip_format_used_in_array.yaml
index 84774a1..ac5114c 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/single_ip_format_used_in_array.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/single_ip_format_used_in_array.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/wrong_network_role.yaml b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/wrong_network_role.yaml
index a3e7806..1d37a53 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/wrong_network_role.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pair_format/fail/wrong_network_role.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pair_format/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_allowed_address_pair_format/pass/valid_heat_template.yaml
index 47343c3..4ca7383 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pair_format/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pair_format/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml
index 655c60a..1d68aec 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_network_role_wrong_in_parameter.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml
index b5abb2b..2332c4c 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/external_network_vm_type_wrong_in_parameter.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml
index 71752dc..9eebf55 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_network_role_wrong_in_parameter.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml
index 607a5cc..09c9ac9 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/internal_network_vm_type_wrong_in_parameter.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml
index 8a38509..baeeb56 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_exernal_nova_server.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml
index 03744d2..a3dc04f 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/fail/mismatch_vm_type_internal_nova_server.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/valid_template.yaml
index 3aa1d2e..8b291bd 100644
--- a/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_allowed_address_pairs_include_vm_type_network_role/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone/fail/missing_increment.yaml b/ice_validator/tests/fixtures/test_availability_zone/fail/missing_increment.yaml
index 98d779a..e1e05e8 100644
--- a/ice_validator/tests/fixtures/test_availability_zone/fail/missing_increment.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone/fail/missing_increment.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone/fail/not_starting_with_availability_zone.yaml b/ice_validator/tests/fixtures/test_availability_zone/fail/not_starting_with_availability_zone.yaml
index b07e8a1..4d12f76 100644
--- a/ice_validator/tests/fixtures/test_availability_zone/fail/not_starting_with_availability_zone.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone/fail/not_starting_with_availability_zone.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml b/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml
index 9bdf372..ab743e3 100644
--- a/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone/fail/using_list_instead_of_get_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_availability_zone/pass/valid_heat_template.yaml
index 9480b5a..fa3cabd 100644
--- a/ice_validator/tests/fixtures/test_availability_zone/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/not_using_get_param.yaml b/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/not_using_get_param.yaml
index bd11a89..fa457b5 100644
--- a/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/not_using_get_param.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/not_using_get_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/only_specifying_param.yaml b/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/only_specifying_param.yaml
index e0cdba9..c2dbb03 100644
--- a/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/only_specifying_param.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone_get_param/fail/only_specifying_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_availability_zone_get_param/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_availability_zone_get_param/pass/valid_heat_template.yaml
index 9480b5a..fa3cabd 100644
--- a/ice_validator/tests/fixtures/test_availability_zone_get_param/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_availability_zone_get_param/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_names/fail/failing_directory/check_cant_fail.yaml b/ice_validator/tests/fixtures/test_base_template_names/fail/failing_directory/check_cant_fail.yaml
index 5f16fcc..24b4c8f 100644
--- a/ice_validator/tests/fixtures/test_base_template_names/fail/failing_directory/check_cant_fail.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_names/fail/failing_directory/check_cant_fail.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,20 +38,20 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-description:
-    base
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: OS::Nova::Server
-        properties:
-            name: {get_param: server_name_0}
-
-outputs:
-    vm_type_volume_id_0:
+description:
+    base
+parameters:
+    vm_type_volume_name_0:
+        type: string
+    vm_type_volume_size_0:
+        type: number
+
+resources:
+    server_0:
+        type: OS::Nova::Server
+        properties:
+            name: {get_param: server_name_0}
+
+outputs:
+    vm_type_volume_id_0:
         value: {get_resource: vm_type_volume_0}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_1/base_well_named.yaml b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_1/base_well_named.yaml
index 5f16fcc..24b4c8f 100644
--- a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_1/base_well_named.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_1/base_well_named.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,20 +38,20 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-description:
-    base
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: OS::Nova::Server
-        properties:
-            name: {get_param: server_name_0}
-
-outputs:
-    vm_type_volume_id_0:
+description:
+    base
+parameters:
+    vm_type_volume_name_0:
+        type: string
+    vm_type_volume_size_0:
+        type: number
+
+resources:
+    server_0:
+        type: OS::Nova::Server
+        properties:
+            name: {get_param: server_name_0}
+
+outputs:
+    vm_type_volume_id_0:
         value: {get_resource: vm_type_volume_0}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_2/well_base_named.yaml b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_2/well_base_named.yaml
index 5f16fcc..24b4c8f 100644
--- a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_2/well_base_named.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_2/well_base_named.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,20 +38,20 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-description:
-    base
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: OS::Nova::Server
-        properties:
-            name: {get_param: server_name_0}
-
-outputs:
-    vm_type_volume_id_0:
+description:
+    base
+parameters:
+    vm_type_volume_name_0:
+        type: string
+    vm_type_volume_size_0:
+        type: number
+
+resources:
+    server_0:
+        type: OS::Nova::Server
+        properties:
+            name: {get_param: server_name_0}
+
+outputs:
+    vm_type_volume_id_0:
         value: {get_resource: vm_type_volume_0}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_3/well_named_base.yaml b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_3/well_named_base.yaml
index 5f16fcc..24b4c8f 100644
--- a/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_3/well_named_base.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_names/pass/base_well_named_3/well_named_base.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,20 +38,20 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-description:
-    base
-parameters:
-    vm_type_volume_name_0:
-        type: string
-    vm_type_volume_size_0:
-        type: number
-
-resources:
-    server_0:
-        type: OS::Nova::Server
-        properties:
-            name: {get_param: server_name_0}
-
-outputs:
-    vm_type_volume_id_0:
+description:
+    base
+parameters:
+    vm_type_volume_name_0:
+        type: string
+    vm_type_volume_size_0:
+        type: number
+
+resources:
+    server_0:
+        type: OS::Nova::Server
+        properties:
+            name: {get_param: server_name_0}
+
+outputs:
+    vm_type_volume_id_0:
         value: {get_resource: vm_type_volume_0}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml
index 103b380..939eebe 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/base_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml
index 8fb2de2..c9ff048 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_1_template_missing_output_consumption.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml
index 31fc359..af26b98 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_child_1_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml
index 8768c46..753dbb9 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/fail/module_2_template_missing_output_consumption.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml
index 103b380..939eebe 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/base_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml
index 8fb2de2..c9ff048 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_1_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml
index 31fc359..af26b98 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_child_1_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml
index 16ec503..473759a 100644
--- a/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml
+++ b/ice_validator/tests/fixtures/test_base_template_outputs_consumed/pass/module_2_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_lon.yaml b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_lon.yaml
index b9c4ff7..eb4b25b 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_lon.yaml
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_lon.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
+ a: 1
+ b:
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_long.env b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_long.env
index 04fb338..624cf60 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_long.env
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_long.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- parameters:
-    b: 2
-    c: 3
+ parameters:
+    b: 2
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_shor.env b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_shor.env
index 04fb338..624cf60 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_shor.env
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_shor.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- parameters:
-    b: 2
-    c: 3
+ parameters:
+    b: 2
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_short.yaml b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_short.yaml
index b9c4ff7..eb4b25b 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_short.yaml
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/match_environment_filename_slightly_short.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
+ a: 1
+ b:
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/no_match_environment_filename.env b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/no_match_environment_filename.env
index 04fb338..624cf60 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/no_match_environment_filename.env
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/fail/no_match/no_match_environment_filename.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- parameters:
-    b: 2
-    c: 3
+ parameters:
+    b: 2
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.env b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.env
index 7cd88e3..1bcc01c 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.env
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-parameters:
-    b: 2
-    c: 3
+parameters:
+    b: 2
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.yaml b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.yaml
index b9c4ff7..eb4b25b 100644
--- a/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.yaml
+++ b/ice_validator/tests/fixtures/test_env_and_yaml_same_name/pass/good_matches/good_yaml_eg.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
+ a: 1
+ b:
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template.yaml b/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template.yaml
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template.yaml
+++ b/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template_env.yaml b/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template_env.yaml
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template_env.yaml
+++ b/ice_validator/tests/fixtures/test_env_files_provided/fail/base_template_env.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.env b/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.env
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.env
+++ b/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.yaml b/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.yaml
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.yaml
+++ b/ice_validator/tests/fixtures/test_env_files_provided/pass/base_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_invalid_key.env b/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_invalid_key.env
index 2ef2317..3624291 100644
--- a/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_invalid_key.env
+++ b/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_invalid_key.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_no_keys.env b/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_no_keys.env
index b9c4ff7..eb4b25b 100644
--- a/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_no_keys.env
+++ b/ice_validator/tests/fixtures/test_environment_file_structure/fail/non_environment_no_keys.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,7 +38,7 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
+ a: 1
+ b:
+    c: 3
     d: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_environment_file_structure/pass/environment.env b/ice_validator/tests/fixtures/test_environment_file_structure/pass/environment.env
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_environment_file_structure/pass/environment.env
+++ b/ice_validator/tests/fixtures/test_environment_file_structure/pass/environment.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_format/fail/invalid_naming_for_fixed_ips.yaml b/ice_validator/tests/fixtures/test_fixed_ips_format/fail/invalid_naming_for_fixed_ips.yaml
index 445bebf..3f8e6ad 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_format/fail/invalid_naming_for_fixed_ips.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_format/fail/invalid_naming_for_fixed_ips.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_format/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_fixed_ips_format/pass/valid_heat_template.yaml
index 46cfdab..248fcf3 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_format/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_format/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_param_not_used_for_fixed_ips.yaml b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_param_not_used_for_fixed_ips.yaml
index 6444de3..c7e5a65 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_param_not_used_for_fixed_ips.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_param_not_used_for_fixed_ips.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_resource_used_for_fixed_ips.yaml b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_resource_used_for_fixed_ips.yaml
index 2b1a9da..5bf166f 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_resource_used_for_fixed_ips.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/fail/get_resource_used_for_fixed_ips.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/pass/valid_heat_template.yaml
index b08c671..abc01f6 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_format_use_get_param/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml
index ec40ab7..98b02e0 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_mismatch_vm_type_nova_server.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml
index 863a557..16326e1 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_network_role_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml
index bafddc3..3445bd4 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/external_wrong_vm_type_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml
index e202460..a240d0b 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_mismatch_vm_type_nova_server.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml
index d9a0d1c..72a83e1 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_network_role_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml
index b7650c1..62932af 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/fail/internal_wrong_vm_type_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
index 48b0080..cbd60b5 100644
--- a/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_fixed_ips_include_vm_type_network_role/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/personality_contains_http.yaml b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/personality_contains_http.yaml
index b0aac43..d03a811 100644
--- a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/personality_contains_http.yaml
+++ b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/personality_contains_http.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_ftp.yaml b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_ftp.yaml
index d7d6c2a..ed2c52b 100644
--- a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_ftp.yaml
+++ b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_ftp.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_http.yaml b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_http.yaml
index fa5b5a4..7333299 100644
--- a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_http.yaml
+++ b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/fail/user_data_contains_http.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/pass/valid_template.yaml
index c950f52..0f5dcb6 100644
--- a/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_get_file_only_reference_local_files/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_numeric_parameters/fail/parameter_numeric_value_missing_constraints.yaml b/ice_validator/tests/fixtures/test_heat_numeric_parameters/fail/parameter_numeric_value_missing_constraints.yaml
index d71b7af..1e3054d 100644
--- a/ice_validator/tests/fixtures/test_heat_numeric_parameters/fail/parameter_numeric_value_missing_constraints.yaml
+++ b/ice_validator/tests/fixtures/test_heat_numeric_parameters/fail/parameter_numeric_value_missing_constraints.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_numeric_parameters/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_heat_numeric_parameters/pass/valid_heat_template.yaml
index 7f29136..0e5ff3d 100644
--- a/ice_validator/tests/fixtures/test_heat_numeric_parameters/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_numeric_parameters/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/env_missing_yaml.env b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/env_missing_yaml.env
index d28ad59..28734f2 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/env_missing_yaml.env
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/env_missing_yaml.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pair.yaml b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pair.yaml
index c83fa04..6d9e846 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pair.yaml
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pair.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pairr.env b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pairr.env
index d28ad59..28734f2 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pairr.env
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/misnamed_pairr.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/yaml_missing_env.yaml b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/yaml_missing_env.yaml
index c83fa04..6d9e846 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/yaml_missing_env.yaml
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/fail/yaml_missing_env.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.env b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.env
index d28ad59..28734f2 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.env
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.yaml b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.yaml
index c83fa04..6d9e846 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.yaml
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.env b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.env
index 43ac5b9..803cd04 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.env
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.yaml b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.yaml
index 47f7424..b8d90cc 100644
--- a/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.yaml
+++ b/ice_validator/tests/fixtures/test_heat_pairs_provided/pass/good_yaml_eg_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
index 09ca0b9..e57ebe5 100644
--- a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
+++ b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_default_value_specified.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
index 4be087d..c3cc4c5 100644
--- a/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
+++ b/ice_validator/tests/fixtures/test_heat_parameter_section/fail/parameter_invalid_keys.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_parameter_section/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_heat_parameter_section/pass/valid_heat_template.yaml
index 7f29136..0e5ff3d 100644
--- a/ice_validator/tests/fixtures/test_heat_parameter_section/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_parameter_section/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/environment.yaml b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/environment.yaml
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/environment.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/environment.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/valid_heat_template.env b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/valid_heat_template.env
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/valid_heat_template.env
+++ b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/fail/valid_heat_template.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/environment.env b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/environment.env
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/environment.env
+++ b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/environment.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yaml
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yml b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yml
index 5d3cd17..e1e864c 100644
--- a/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yml
+++ b/ice_validator/tests/fixtures/test_heat_template_and_env_file_extension/pass/valid_heat_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_description.yaml b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_description.yaml
index e8de8e3..8441131 100644
--- a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_description.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_description.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_type.yaml b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_type.yaml
index c547a59..970c22d 100644
--- a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_type.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/fail/template_missing_type.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/pass/valid_template.yaml
index 7f29136..0e5ff3d 100644
--- a/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_parameters_contain_required_fields/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yaml
index bf64f9a..8790b63 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yml
index bf64f9a..8790b63 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_invalid_keys.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_no_valid_keys.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_no_valid_keys.yaml
index 74bf184..b7bfac1 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_no_valid_keys.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/fail/non_heat_template_no_valid_keys.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yaml
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yml b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yml
index 5d3cd17..e1e864c 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template_minimal_sections.yaml b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template_minimal_sections.yaml
index 260d284..725e0ae 100644
--- a/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template_minimal_sections.yaml
+++ b/ice_validator/tests/fixtures/test_heat_template_structure/pass/valid_heat_template_minimal_sections.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.env b/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.env
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.env
+++ b/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.template b/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.template
index 4c1fdcc..07a5251 100644
--- a/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.template
+++ b/ice_validator/tests/fixtures/test_heat_templates_provided/fail/base_template.template
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.env b/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.env
index e7e2ac3..a9e6f1a 100644
--- a/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.env
+++ b/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.yaml b/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.yaml
index fceb0ff..215e406 100644
--- a/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.yaml
+++ b/ice_validator/tests/fixtures/test_heat_templates_provided/pass/base_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates/fail/heat_template_missing_nested_files.yaml b/ice_validator/tests/fixtures/test_nested_templates/fail/heat_template_missing_nested_files.yaml
index b65d6ac..87a3aa6 100644
--- a/ice_validator/tests/fixtures/test_nested_templates/fail/heat_template_missing_nested_files.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates/fail/heat_template_missing_nested_files.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_1.yaml b/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_1.yaml
index ef5a06e..cb8e4a9 100644
--- a/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_1.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_2.yaml b/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_2.yaml
index ef5a06e..cb8e4a9 100644
--- a/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_2.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates/pass/nested_template_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates/pass/valid_nested_heat_template.yaml b/ice_validator/tests/fixtures/test_nested_templates/pass/valid_nested_heat_template.yaml
index 676437f..74b795f 100644
--- a/ice_validator/tests/fixtures/test_nested_templates/pass/valid_nested_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates/pass/valid_nested_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/fail/heat_template_invalid_nesting.yaml b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/fail/heat_template_invalid_nesting.yaml
index f1e47e0..c79a5e3 100644
--- a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/fail/heat_template_invalid_nesting.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/fail/heat_template_invalid_nesting.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_1.yaml b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_1.yaml
index ef5a06e..cb8e4a9 100644
--- a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_1.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_2.yaml b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_2.yaml
index ef5a06e..cb8e4a9 100644
--- a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_2.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/nested_template_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_nested_heat_template.yaml b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_nested_heat_template.yaml
index 7782b56..b9a0e62 100644
--- a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_nested_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_nested_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_non_nested_template.yaml b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_non_nested_template.yaml
index bc2e53d..d6ce213 100644
--- a/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_non_nested_template.yaml
+++ b/ice_validator/tests/fixtures/test_nested_templates_invalid_nesting/pass/valid_non_nested_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml b/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml
index 85bc86c..3a60812 100644
--- a/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml
+++ b/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml
index ef28f27..83358b2 100644
--- a/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_param_not_used_for_network.yaml b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_param_not_used_for_network.yaml
index 3673598..56976d8 100644
--- a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_param_not_used_for_network.yaml
+++ b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_param_not_used_for_network.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
index cf34fce..7344d16 100644
--- a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
+++ b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
index bed976e..6c8b69d 100644
--- a/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_network_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.env b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.env
index 3a136c9..487bc4e 100644
--- a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.env
+++ b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,9 +38,9 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-parameters:
-    out: 2
-    res: 3
-    indexed: 4
-    unused_env: 4
+parameters:
+    out: 2
+    res: 3
+    indexed: 4
+    unused_env: 4
     indx: 1
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.yaml b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.yaml
index 421a699..51cacba 100644
--- a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.yaml
+++ b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/fail/unused_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,30 +38,30 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-parameters:
-  out:
-    type: string
-    description: test for output
-  res:
-    type: string
-    description: test for resources
-  indexed:
-    type: comma_delimited_list
-    description: test for indexed param
-  indx:
-    type: number
-    description: Index of the current instance
-  unused_yaml:
-    type: number
-    description: unused param in yaml file
-resources:
-  test:
-    type: abc
-    properties:
-      test_res: {get_param: res}
-      test_ind_param: { get_param: [ indexed, { get_param: indx } ] }
-
-outputs:
-  test_out:
-    description: test getting output param
+parameters:
+  out:
+    type: string
+    description: test for output
+  res:
+    type: string
+    description: test for resources
+  indexed:
+    type: comma_delimited_list
+    description: test for indexed param
+  indx:
+    type: number
+    description: Index of the current instance
+  unused_yaml:
+    type: number
+    description: unused param in yaml file
+resources:
+  test:
+    type: abc
+    properties:
+      test_res: {get_param: res}
+      test_ind_param: { get_param: [ indexed, { get_param: indx } ] }
+
+outputs:
+  test_out:
+    description: test getting output param
     value: {get_param: out}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.env b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.env
index 06a9821..9477fac 100644
--- a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.env
+++ b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,8 +38,8 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-parameters:
-    out: 2
-    res: 3
-    indexed: 4
+parameters:
+    out: 2
+    res: 3
+    indexed: 4
     indx: 1
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.yaml b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.yaml
index 953191b..dc48c50 100644
--- a/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.yaml
+++ b/ice_validator/tests/fixtures/test_no_unused_parameters_between_env_and_templates/pass/no_unused_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,28 +38,28 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
-parameters:
-  out:
-    type: string
-    description: test for output
-  res:
-    type: string
-    description: test for resources
-  indexed:
-    type: comma_delimited_list
-    description: test for indexed param
-  indx:
-    type: number
-    description: Index of the current instance
-
-resources:
-  test:
-    type: abc
-    properties:
-      test_res: {get_param: res}
-      test_ind_param: { get_param: [ indexed, { get_param: indx } ] }
-
-outputs:
-  test_out:
-    description: test getting output param
+parameters:
+  out:
+    type: string
+    description: test for output
+  res:
+    type: string
+    description: test for resources
+  indexed:
+    type: comma_delimited_list
+    description: test for indexed param
+  indx:
+    type: number
+    description: Index of the current instance
+
+resources:
+  test:
+    type: abc
+    properties:
+      test_res: {get_param: res}
+      test_ind_param: { get_param: [ indexed, { get_param: indx } ] }
+
+outputs:
+  test_out:
+    description: test getting output param
     value: {get_param: out}
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml b/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml
index 047673d..507fa5c 100644
--- a/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml
+++ b/ice_validator/tests/fixtures/test_nova_servergroup_policies/fail/not_supported_policies.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml b/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml
index 5e50a1b..ea363d7 100644
--- a/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml
+++ b/ice_validator/tests/fixtures/test_nova_servergroup_policies/pass/with_supported_policies.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/fail/wrong_type_for_parameters.yaml b/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/fail/wrong_type_for_parameters.yaml
index 6bddeee..7f44498 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/fail/wrong_type_for_parameters.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/fail/wrong_type_for_parameters.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/pass/valid_heat_template.yaml
index d51217c..39030c7 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_correct_parameter_types/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties.yaml b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties.yaml
index b8dfc76..7660752 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties_uppercase.yaml b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties_uppercase.yaml
index ecd9838..d0f06e8 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties_uppercase.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_key_properties_uppercase.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id.yaml b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id.yaml
index c1c55be..cafd51a 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id_uppercase.yaml b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id_uppercase.yaml
index d5f0cdc..2edaf5d 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id_uppercase.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/fail/mismatch_vm_type_resource_id_uppercase.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/pass/valid_heat_template.yaml
index 0c1f8c0..3796de9 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_resource_ids/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_resource_ids/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_vm_types/fail/inconsistent_vm_type.yaml b/ice_validator/tests/fixtures/test_nova_servers_vm_types/fail/inconsistent_vm_type.yaml
index c8b6403..219bf94 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_vm_types/fail/inconsistent_vm_type.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_vm_types/fail/inconsistent_vm_type.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_vm_types/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_nova_servers_vm_types/pass/valid_heat_template.yaml
index 8d3a0df..eb07cae 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_vm_types/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_vm_types/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/missing_get_param.yaml b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/missing_get_param.yaml
index f3ec510..f5c71a4 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/missing_get_param.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/missing_get_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/using_str_replace_instead_of_get_param.yaml b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/using_str_replace_instead_of_get_param.yaml
index 773b28d..cdc4055 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/using_str_replace_instead_of_get_param.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/fail/using_str_replace_instead_of_get_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/pass/valid_heat_template.yaml
index bb37559..4b4c5c6 100644
--- a/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_nova_servers_vm_types_use_get_param/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_less_indent_on_value.yaml b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_less_indent_on_value.yaml
index 59a58b4..184245b 100644
--- a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_less_indent_on_value.yaml
+++ b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_less_indent_on_value.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,16 +38,16 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
-    d: 4
- e:
-    f: 3
-    g: 4
-    h: 3
-    i: 4
-    j: 3
-    d:
-   c: 3
+ a: 1
+ b:
+    c: 3
+    d: 4
+ e:
+    f: 3
+    g: 4
+    h: 3
+    i: 4
+    j: 3
+    d:
+   c: 3
      lkf: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_multierror.yaml b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_multierror.yaml
index 4e0636e..bba1536 100644
--- a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_multierror.yaml
+++ b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_multierror.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,17 +38,17 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
-    d: 4
- e:
-    f: 3
-    g: 4
-	h: 3
-    i: 4
-    j: 3
-    ddfg
-        c: 3
-    lkf:
+ a: 1
+ b:
+    c: 3
+    d: 4
+ e:
+    f: 3
+    g: 4
+	h: 3
+    i: 4
+    j: 3
+    ddfg
+        c: 3
+    lkf:
  fhe: 5
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_tab.yaml b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_tab.yaml
index b16ec7a..e66b77f 100644
--- a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_tab.yaml
+++ b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_tab.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,16 +38,16 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
-    d: 4
- e:
-    f: 3
-    g: 4
-	h: 3
-    i: 4
-    j: 3
-    d:
-        c: 3
+ a: 1
+ b:
+    c: 3
+    d: 4
+ e:
+    f: 3
+    g: 4
+	h: 3
+    i: 4
+    j: 3
+    d:
+        c: 3
     lkf: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_value_and_keys.yaml b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_value_and_keys.yaml
index 85e350b..a01a1bf 100644
--- a/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_value_and_keys.yaml
+++ b/ice_validator/tests/fixtures/test_parse_yaml/fail/bad_yaml_value_and_keys.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,16 +38,16 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
-    d: 4
- e:
-    f: 3
-    g: 4
- h: 3
-    i: 4
-    j: 3
-    d:
-        c: 3
+ a: 1
+ b:
+    c: 3
+    d: 4
+ e:
+    f: 3
+    g: 4
+ h: 3
+    i: 4
+    j: 3
+    d:
+        c: 3
     lkf: 4
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_parse_yaml/pass/good_yaml_eg.yaml b/ice_validator/tests/fixtures/test_parse_yaml/pass/good_yaml_eg.yaml
index 8b5b820..559c598 100644
--- a/ice_validator/tests/fixtures/test_parse_yaml/pass/good_yaml_eg.yaml
+++ b/ice_validator/tests/fixtures/test_parse_yaml/pass/good_yaml_eg.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -38,15 +38,15 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 ---
- a: 1
- b:
-    c: 3
-    d: 4
-    e:
-       f: 4
-    g:
-       h:
-          test: test
-       k: g
-
+ a: 1
+ b:
+    c: 3
+    d: 4
+    e:
+       f: 4
+    g:
+       h:
+          test: test
+       k: g
+
     test: out
\ No newline at end of file
diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/fail/mismatch_vm_type_port_id_get_resource.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/fail/mismatch_vm_type_port_id_get_resource.yaml
index ac1b60c..bc0d4cd 100644
--- a/ice_validator/tests/fixtures/test_port_resource_ids/fail/mismatch_vm_type_port_id_get_resource.yaml
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/fail/mismatch_vm_type_port_id_get_resource.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource.yaml
index e944a35..ab5ea32 100644
--- a/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource.yaml
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource_uppercase.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource_uppercase.yaml
index 62a264e..34ba50a 100644
--- a/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource_uppercase.yaml
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/fail/wrong_port_attached_to_nova_server_get_resource_uppercase.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
index 20bc79e..50f2bd1 100644
--- a/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_port_resource_ids/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_1.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_1.yaml
index d5914ec..702b639 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_1.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_2.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_2.yaml
index 23d0bd5..54edcc8 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_2.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_definition_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_reference_1.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_reference_1.yaml
index 101a01d..8341ba0 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_reference_1.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/fail/missing_param_reference_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_1.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_1.yaml
index cf9e241..e852402 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_1.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
index 8f1e3bb..ff8421f 100644
--- a/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
+++ b/ice_validator/tests/fixtures/test_referenced_and_defined_parameters_match/pass/params_referenced_are_defined_and_vice_versa_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_no_constraints/fail/heat_template_required_parameters_with_constraints.yaml b/ice_validator/tests/fixtures/test_required_parameters_no_constraints/fail/heat_template_required_parameters_with_constraints.yaml
index 030dfdf..1a49f68 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_no_constraints/fail/heat_template_required_parameters_with_constraints.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_no_constraints/fail/heat_template_required_parameters_with_constraints.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_no_constraints/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_required_parameters_no_constraints/pass/valid_heat_template.yaml
index c939a89..49ae894 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_no_constraints/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_no_constraints/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.env b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.env
index ab54063..ca27e57 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.env
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.yaml
index 275b820..6bda6ac 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/fail/missing_required_parameters_in_env_file.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.env b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.env
index 116a359..147ca54 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.env
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.yaml
index 275b820..6bda6ac 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.env b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.env
index cbf5f64..3676b06 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.env
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.env
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.yaml
index 5ac62ae..e4089b5 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_env_files/pass/required_parameters_specified_not_needed.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/fail/missing_required_parameters_in_template.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/fail/missing_required_parameters_in_template.yaml
index 1baef47..0769f82 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/fail/missing_required_parameters_in_template.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/fail/missing_required_parameters_in_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified.yaml
index 275b820..6bda6ac 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified_not_needed.yaml b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified_not_needed.yaml
index 5ac62ae..e4089b5 100644
--- a/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified_not_needed.yaml
+++ b/ice_validator/tests/fixtures/test_required_parameters_specified_in_heat_templates/pass/required_parameters_specified_not_needed.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/fail/invalid_characters_in_resource_id_template.yml b/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/fail/invalid_characters_in_resource_id_template.yml
index fc32cdf..bd4316a 100644
--- a/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/fail/invalid_characters_in_resource_id_template.yml
+++ b/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/fail/invalid_characters_in_resource_id_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/pass/valid_characters_in_resource_id_template.yml b/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/pass/valid_characters_in_resource_id_template.yml
index d63a6a9..9681015 100644
--- a/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/pass/valid_characters_in_resource_id_template.yml
+++ b/ice_validator/tests/fixtures/test_resource_ids_alphanumeric_only/pass/valid_characters_in_resource_id_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_index.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_index.yaml
index fd3db32..55019f8 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_index.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_index.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name.yaml
index f4049e6..b48c3cd 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name_in_rsg.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name_in_rsg.yaml
index 6ecccc9..e823457 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name_in_rsg.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/fail/template_missing_specified_vf_module_name_in_rsg.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_1.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_1.yaml
index 5a91f45..999e081 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_1.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_2.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_2.yaml
index 09005ed..3286688 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_2.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_3.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_3.yaml
index 41bfc06..e6f9a6f 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_3.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_3.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_4.yaml b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_4.yaml
index dd45592..4f46b47 100644
--- a/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_4.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_optional_metadata/pass/valid_heat_template_4.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vf_module_id.yaml b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vf_module_id.yaml
index f8433c9..c4a789e 100644
--- a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vf_module_id.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vf_module_id.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_id.yaml b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_id.yaml
index 012bf20..375f05a 100644
--- a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_id.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_id.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_name.yaml b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_name.yaml
index 6a98246..a232779 100644
--- a/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_name.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_required_metadata/fail/missing_vnf_name.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_have_required_metadata/pass/has_required_metadata.yaml b/ice_validator/tests/fixtures/test_servers_have_required_metadata/pass/has_required_metadata.yaml
index 4351101..fddd744 100644
--- a/ice_validator/tests/fixtures/test_servers_have_required_metadata/pass/has_required_metadata.yaml
+++ b/ice_validator/tests/fixtures/test_servers_have_required_metadata/pass/has_required_metadata.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_metadata_section.yaml b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_metadata_section.yaml
index 8f44729..c2a44ba 100644
--- a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_metadata_section.yaml
+++ b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_metadata_section.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_properties_section.yaml b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_properties_section.yaml
index d43b745..2e480d6 100644
--- a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_properties_section.yaml
+++ b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/missing_properties_section.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/not_using_get_param.yaml b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/not_using_get_param.yaml
index 8301db6..cad3301 100644
--- a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/not_using_get_param.yaml
+++ b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/fail/not_using_get_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/pass/has_required_metadata.yaml b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/pass/has_required_metadata.yaml
index 4351101..fddd744 100644
--- a/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/pass/has_required_metadata.yaml
+++ b/ice_validator/tests/fixtures/test_servers_metadata_use_get_param/pass/has_required_metadata.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_param_subnet.yaml b/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_param_subnet.yaml
index 4254287..bbdbdca 100644
--- a/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_param_subnet.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_param_subnet.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_resource_subnet.yaml b/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_resource_subnet.yaml
index 1af8d52..02a54ac 100644
--- a/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_resource_subnet.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format/fail/invalid_naming_used_for_get_resource_subnet.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_subnet_format/pass/valid_heat_template.yaml
index 5251083..77bc904 100644
--- a/ice_validator/tests/fixtures/test_subnet_format/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_param_not_used_for_subnet.yaml b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_param_not_used_for_subnet.yaml
index 353fbe9..81908c2 100644
--- a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_param_not_used_for_subnet.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_param_not_used_for_subnet.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
index 4338edc..e2ad5f4 100644
--- a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/fail/get_resource_used_for_external_network.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
index 76f92e6..d6bf4bf 100644
--- a/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
+++ b/ice_validator/tests/fixtures/test_subnet_format_use_get_param_or_get_resource/pass/valid_heat_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_1.yaml b/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_1.yaml
index a65c45b..22c73de 100644
--- a/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_1.yaml
+++ b/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_2_identical_to_heat_template_2.yaml b/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_2_identical_to_heat_template_2.yaml
index a65c45b..22c73de 100644
--- a/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_2_identical_to_heat_template_2.yaml
+++ b/ice_validator/tests/fixtures/test_unique_name_resources/fail/heat_template_2_identical_to_heat_template_2.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_1.yml b/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_1.yml
index a65c45b..22c73de 100644
--- a/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_1.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_1.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_2.yml b/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_2.yml
index 253d861..ec01c0b 100644
--- a/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_2.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_resources/pass/unique_resource_template_2.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/fail/unique_resource_stack_name_without_vnf_name_or_module.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
index fb38c95..85ea78c 100644
--- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/pass/unique_resource_template.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/pass/unique_resource_template.yml
index 936e85d..5abcc2a 100644
--- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/pass/unique_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_params_in_tmpl/pass/unique_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
index a3af653..131f2bb 100644
--- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/fail/unique_resource_stack_name_without_vnf_name_or_module.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml
index 0a70283..5a39e57 100644
--- a/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_name_str_replace_use_req_params/pass/unique_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/duplicate_resource_template.yml b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/duplicate_resource_template.yml
index 5ac2dc2..798e591 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/duplicate_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/duplicate_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/unique_resource_template.yml b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/unique_resource_template.yml
index 3ef1600..426295d 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/unique_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/fail/unique_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_1.yml b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_1.yml
index 3ef1600..426295d 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_1.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_1.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_2.yml b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_2.yml
index fc68cba..630c6d6 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_2.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_all_templates/pass/unique_resource_template_2.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_template/fail/duplicate_resource_template.yml b/ice_validator/tests/fixtures/test_unique_resources_across_template/fail/duplicate_resource_template.yml
index 16997d5..40543d1 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_template/fail/duplicate_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_template/fail/duplicate_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_unique_resources_across_template/pass/unique_resource_template.yml b/ice_validator/tests/fixtures/test_unique_resources_across_template/pass/unique_resource_template.yml
index 4279b1c..82b1d7e 100644
--- a/ice_validator/tests/fixtures/test_unique_resources_across_template/pass/unique_resource_template.yml
+++ b/ice_validator/tests/fixtures/test_unique_resources_across_template/pass/unique_resource_template.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_format_outputs/fail/no_value_volume.yaml b/ice_validator/tests/fixtures/test_volume_format_outputs/fail/no_value_volume.yaml
index b630778..eec1fbd 100644
--- a/ice_validator/tests/fixtures/test_volume_format_outputs/fail/no_value_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_format_outputs/fail/no_value_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_format_outputs/fail/use_get_param_volume.yml b/ice_validator/tests/fixtures/test_volume_format_outputs/fail/use_get_param_volume.yml
index 2766dda..90ba1ca 100644
--- a/ice_validator/tests/fixtures/test_volume_format_outputs/fail/use_get_param_volume.yml
+++ b/ice_validator/tests/fixtures/test_volume_format_outputs/fail/use_get_param_volume.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_format_outputs/pass/valid_template_volume.yml b/ice_validator/tests/fixtures/test_volume_format_outputs/pass/valid_template_volume.yml
index 97c6ab6..fa016a2 100644
--- a/ice_validator/tests/fixtures/test_volume_format_outputs/pass/valid_template_volume.yml
+++ b/ice_validator/tests/fixtures/test_volume_format_outputs/pass/valid_template_volume.yml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters.yaml b/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters.yaml
index 1057cb3..d382920 100644
--- a/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters.yaml
+++ b/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters_volume.yaml b/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters_volume.yaml
index 3ff6c48..6f2e146 100644
--- a/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_outputs_consumed/fail/more_outputs_than_parameters_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template.yaml
index efdb26a..47c8eea 100644
--- a/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template_volume.yaml b/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template_volume.yaml
index 7a4e40d..4a40502 100644
--- a/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_outputs_consumed/pass/valid_template_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml
index 2b78e58..d0a176d 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_instance_uuid_volume_attachment.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml
index 76aa95e..cc01ffb 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_nova_server_id.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml
index b0ff140..6918125 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_param.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml
index 88fc6e2..4b3c40f 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_resource.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml
index b07b2c1..32b53cb 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml
index 53e76b9..9a2dc98 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/fail/mismatch_vm_type_volume_id_volume_attachment_uppercase.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml b/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml
index bd18829..8b98f20 100644
--- a/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml
+++ b/ice_validator/tests/fixtures/test_volume_resource_ids/pass/valid_template.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates/fail/badly_named_volume_1.yaml b/ice_validator/tests/fixtures/test_volume_templates/fail/badly_named_volume_1.yaml
index 946c646..52402d5 100644
--- a/ice_validator/tests/fixtures/test_volume_templates/fail/badly_named_volume_1.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates/fail/badly_named_volume_1.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates/fail/missing_keyword.yaml b/ice_validator/tests/fixtures/test_volume_templates/fail/missing_keyword.yaml
index 946c646..52402d5 100644
--- a/ice_validator/tests/fixtures/test_volume_templates/fail/missing_keyword.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates/fail/missing_keyword.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates/fail/only_nova_severs_in_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates/fail/only_nova_severs_in_volume.yaml
index d7a218e..4b1a46e 100644
--- a/ice_validator/tests/fixtures/test_volume_templates/fail/only_nova_severs_in_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates/fail/only_nova_severs_in_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates/pass/well_named_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates/pass/well_named_volume.yaml
index 7b29979..c657882 100644
--- a/ice_validator/tests/fixtures/test_volume_templates/pass/well_named_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates/pass/well_named_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs/fail/missing_outputs_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs/fail/missing_outputs_volume.yaml
index 248bb62..2d10e22 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs/fail/missing_outputs_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs/fail/missing_outputs_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs/pass/well_named_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs/pass/well_named_volume.yaml
index 5ee2cf6..df35929 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs/pass/well_named_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs/pass/well_named_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_1_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_1_volume.yaml
index a55a4b2..ec56510 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_1_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_1_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_2_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_2_volume.yaml
index 0a196e3..44ec7b8 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_2_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_2_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_3_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_3_volume.yaml
index 6a05126..2cbfc2e 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_3_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/mismatch_resource_keys_outputs_keys_3_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_outputs_than_resources_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_outputs_than_resources_volume.yaml
index 3f9cac7..1cb9115 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_outputs_than_resources_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_outputs_than_resources_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_resources_than_outputs_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_resources_than_outputs_volume.yaml
index d446a98..a84b629 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_resources_than_outputs_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/fail/more_resources_than_outputs_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/pass/valid_template_volume.yaml b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/pass/valid_template_volume.yaml
index 1780dc6..2ed9b7b 100644
--- a/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/pass/valid_template_volume.yaml
+++ b/ice_validator/tests/fixtures/test_volume_templates_outputs_resources/pass/valid_template_volume.yaml
@@ -6,7 +6,7 @@
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/parametrizers.py b/ice_validator/tests/parametrizers.py
index dcfe402..511c39a 100644
--- a/ice_validator/tests/parametrizers.py
+++ b/ice_validator/tests/parametrizers.py
@@ -48,30 +48,32 @@ import pytest
 from .helpers import get_parsed_yml_for_yaml_files, check_basename_ending
 from .utils.nested_files import get_list_of_nested_files
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
+
 
 # pylint: disable=invalid-name
 
 
 def get_template_dir(metafunc):
-    '''
+    """
     returns template_dir, either as its passed in on CLI
     or, during --self-test, the directory whos name matches
     the current tests module name
-    '''
-    if metafunc.config.getoption('template_dir') is None:
+    """
+    if metafunc.config.getoption("template_dir") is None:
         return path.join(
             path.dirname(path.realpath(__file__)),
-            'fixtures',
-            metafunc.function.__module__.split('.')[-1])
+            "fixtures",
+            metafunc.function.__module__.split(".")[-1],
+        )
     else:
-        return metafunc.config.getoption('template_dir')[0]
+        return metafunc.config.getoption("template_dir")[0]
 
 
 def get_nested_files(filenames):
-    '''
+    """
     returns all the nested files for a set of filenames
-    '''
+    """
     nested_files = []
     for filename in filenames:
         try:
@@ -79,9 +81,9 @@ def get_nested_files(filenames):
                 yml = yaml.load(fh)
             if "resources" not in yml:
                 continue
-            nested_files.extend(get_list_of_nested_files(
-                    yml["resources"],
-                    path.dirname(filename)))
+            nested_files.extend(
+                get_list_of_nested_files(yml["resources"], path.dirname(filename))
+            )
         except yaml.YAMLError as e:
             print(e)  # pylint: disable=superfluous-parens
             continue
@@ -89,337 +91,309 @@ def get_nested_files(filenames):
 
 
 def list_filenames_in_template_dir(
-            metafunc,
-            extensions,
-            template_type='',
-            sub_dirs=None):
-    '''
+        metafunc, extensions, template_type="", sub_dirs=None
+):
+    """
     returns the filenames in a template_dir, either as its passed in
     on CLI or, during --self-test, the directory whos name matches
     the current tests module name
-    '''
+    """
     sub_dirs = [] if sub_dirs is None else sub_dirs
     template_dir = get_template_dir(metafunc)
     filenames = []
-    if metafunc.config.getoption('self_test'):
-        filenames = [path.join(template_dir, s, f)
-                     for s in sub_dirs
-                     for f in listdir(path.join(template_dir, s))
-                     if path.isfile(path.join(template_dir, s, f))
-                     and path.splitext(f)[-1] in extensions
-                     and check_basename_ending(
-                        template_type,
-                        path.splitext(f)[0])]
+    if metafunc.config.getoption("self_test"):
+        filenames = [
+            path.join(template_dir, s, f)
+            for s in sub_dirs
+            for f in listdir(path.join(template_dir, s))
+            if (path.isfile(path.join(template_dir, s, f)) and
+                path.splitext(f)[-1] in extensions and
+                check_basename_ending(template_type, path.splitext(f)[0]))
+        ]
     else:
-        filenames = [path.join(template_dir, f)
-                     for f in listdir(template_dir)
-                     if path.isfile(path.join(template_dir, f))
-                     and path.splitext(f)[-1] in extensions
-                     and check_basename_ending(
-                        template_type,
-                        path.splitext(f)[0])]
+        filenames = [
+            path.join(template_dir, f)
+            for f in listdir(template_dir)
+            if (path.isfile(path.join(template_dir, f)) and
+                path.splitext(f)[-1] in extensions and
+                check_basename_ending(template_type, path.splitext(f)[0]))
+        ]
     return filenames
 
 
 def list_template_dir(
-            metafunc,
-            extensions,
-            exclude_nested=True,
-            template_type='',
-            sub_dirs=None):
-    '''
+        metafunc, extensions, exclude_nested=True, template_type="", sub_dirs=None
+):
+    """
     returns the filenames excluding the nested files for a template_dir,
     either as its passed in on CLI or, during --self-test, the
     directory whos name matches the current tests module name
-    '''
+    """
     sub_dirs = [] if sub_dirs is None else sub_dirs
     filenames = []
     nested_files = []
     filenames = list_filenames_in_template_dir(
-            metafunc,
-            extensions,
-            template_type,
-            sub_dirs)
+        metafunc, extensions, template_type, sub_dirs
+    )
     if exclude_nested:
         nested_files = get_nested_files(filenames)
     return list(set(filenames) - set(nested_files))
 
 
 def get_filenames_list(
-            metafunc,
-            extensions=None,
-            exclude_nested=False,
-            template_type=''):
-    '''
+        metafunc, extensions=None, exclude_nested=False, template_type=""
+):
+    """
     returns the filename fixtures for the template dir, either as by how its
     passed in on CLI or, during --self-test, the directory whos name
     matches the current tests module name
-    '''
-    extensions = [
-            ".yaml",
-            ".yml",
-            ".env"
-            ] if extensions is None else extensions
-    if metafunc.config.getoption('self_test'):
-        filenames_list = list_template_dir(metafunc,
-                                           extensions,
-                                           exclude_nested,
-                                           template_type,
-                                           ['pass'])
-        filenames_list += [pytest.mark.xfail(f, strict=True)
-                           for f in list_template_dir(metafunc,
-                                                      extensions,
-                                                      exclude_nested,
-                                                      template_type,
-                                                      ['fail'])]
+    """
+    extensions = [".yaml", ".yml", ".env"] if extensions is None else extensions
+    if metafunc.config.getoption("self_test"):
+        filenames_list = list_template_dir(
+            metafunc, extensions, exclude_nested, template_type, ["pass"]
+        )
+        filenames_list += [
+            pytest.mark.xfail(f, strict=True)
+            for f in list_template_dir(
+                metafunc, extensions, exclude_nested, template_type, ["fail"]
+            )
+        ]
     else:
-        filenames_list = list_template_dir(metafunc,
-                                           extensions,
-                                           exclude_nested,
-                                           template_type)
+        filenames_list = list_template_dir(
+            metafunc, extensions, exclude_nested, template_type
+        )
 
     return filenames_list
 
 
 def get_filenames_lists(
-            metafunc,
-            extensions=None,
-            exclude_nested=False,
-            template_type=''):
-    '''
+        metafunc, extensions=None, exclude_nested=False, template_type=""
+):
+    """
     returns the list of files in the template dir, either as by how its
     passed in on CLI or, during --self-test, the directory whos name
     matches the current tests module name
-    '''
-    extensions = [
-            ".yaml",
-            ".yml",
-            ".env"
-            ] if extensions is None else extensions
+    """
+    extensions = [".yaml", ".yml", ".env"] if extensions is None else extensions
     filenames_lists = []
-    if metafunc.config.getoption('self_test'):
-        filenames_lists.append(list_template_dir(metafunc,
-                                                 extensions,
-                                                 exclude_nested,
-                                                 template_type,
-                                                 ['pass']))
-        filenames_lists.append(pytest.mark.xfail(
-                            list_template_dir(metafunc,
-                                              extensions,
-                                              exclude_nested,
-                                              template_type,
-                                              ['fail']),
-                            strict=True))
+    if metafunc.config.getoption("self_test"):
+        filenames_lists.append(
+            list_template_dir(
+                metafunc, extensions, exclude_nested, template_type, ["pass"]
+            )
+        )
+        filenames_lists.append(
+            pytest.mark.xfail(
+                list_template_dir(
+                    metafunc, extensions, exclude_nested, template_type, ["fail"]
+                ),
+                strict=True,
+            )
+        )
     else:
-        filenames_lists.append(list_template_dir(metafunc,
-                                                 extensions,
-                                                 exclude_nested,
-                                                 template_type))
+        filenames_lists.append(
+            list_template_dir(metafunc, extensions, exclude_nested, template_type)
+        )
     return filenames_lists
 
 
 def get_parsed_yaml_files(
-            metafunc,
-            extensions,
-            exclude_nested=True,
-            template_type='',
-            sections=None):
-    '''
+        metafunc, extensions, exclude_nested=True, template_type="", sections=None
+):
+    """
     returns the list of parsed yaml files in the specified template dir,
     either as by how its passed in on CLI or, during --self-test, the
     directory whos name matches the current tests module name
-    '''
+    """
     sections = [] if sections is None else sections
     extensions = [".yaml", ".yml"]
 
-    if metafunc.config.getoption('self_test'):
-        yaml_files = list_template_dir(metafunc, extensions, exclude_nested,
-                                       template_type, ['pass'])
-        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files,
-                                                        sections)
-
-        yaml_files = list_template_dir(metafunc, extensions, exclude_nested,
-                                       template_type, ['fail'])
-        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files,
-                                                        sections)
-        parsed_yml_list += [pytest.mark.xfail(parsed_yml, strict=True)
-                            for parsed_yml in parsed_yml_list]
+    if metafunc.config.getoption("self_test"):
+        yaml_files = list_template_dir(
+            metafunc, extensions, exclude_nested, template_type, ["pass"]
+        )
+        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files, sections)
+
+        yaml_files = list_template_dir(
+            metafunc, extensions, exclude_nested, template_type, ["fail"]
+        )
+        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files, sections)
+        parsed_yml_list += [
+            pytest.mark.xfail(parsed_yml, strict=True) for parsed_yml in parsed_yml_list
+        ]
     else:
         yaml_files = list_template_dir(metafunc, extensions)
-        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files,
-                                                        sections)
+        parsed_yml_list = get_parsed_yml_for_yaml_files(yaml_files, sections)
     return parsed_yml_list
 
 
 def parametrize_filenames(metafunc):
-    '''
+    """
     This param runs tests all files in the template dir
-    '''
+    """
     filenames = get_filenames_lists(metafunc)
-    metafunc.parametrize('filenames', filenames)
+    metafunc.parametrize("filenames", filenames)
 
 
 def parametrize_filename(metafunc):
-    '''
+    """
     This param runs tests once for every file in the template dir
-    '''
+    """
     filenames = get_filenames_list(metafunc)
-    metafunc.parametrize('filename', filenames)
+    metafunc.parametrize("filename", filenames)
 
 
 def parametrize_yaml_files(metafunc):
-    '''
+    """
     This param runs tests for the yaml files in the template dir
-    '''
-    yaml_files = get_filenames_lists(metafunc, ['.yaml', '.yml'], False)
+    """
+    yaml_files = get_filenames_lists(metafunc, [".yaml", ".yml"], False)
     metafunc.parametrize("yaml_files", yaml_files)
 
 
 def parametrize_yaml_file(metafunc):
-    '''
+    """
     This param runs tests for every yaml file in the template dir
-    '''
-    yaml_files = get_filenames_list(metafunc, ['.yaml', '.yml'], False)
-    metafunc.parametrize('yaml_file', yaml_files)
+    """
+    yaml_files = get_filenames_list(metafunc, [".yaml", ".yml"], False)
+    metafunc.parametrize("yaml_file", yaml_files)
 
 
 def parametrize_templates(metafunc):
-    '''
+    """
     This param runs tests for the template in the template dir
-    '''
-    templates = get_filenames_lists(metafunc, ['.yaml', '.yml'], True)
+    """
+    templates = get_filenames_lists(metafunc, [".yaml", ".yml"], True)
     metafunc.parametrize("templates", templates)
 
 
 def parametrize_template(metafunc):
-    '''
+    """
     This param runs tests for every template in the template dir
-    '''
-    templates = get_filenames_list(metafunc, ['.yaml', '.yml'], True)
-    metafunc.parametrize('template', templates)
+    """
+    templates = get_filenames_list(metafunc, [".yaml", ".yml"], True)
+    metafunc.parametrize("template", templates)
 
 
 def parametrize_parsed_yaml_file(metafunc):
-    '''
+    """
     This param runs tests for a parsed version of each yaml file
     in the template dir
-    '''
-    parsed_yaml_files = get_parsed_yaml_files(metafunc, ['.yaml', '.yml'],
-                                              False)
-    metafunc.parametrize('parsed_yaml_file', parsed_yaml_files)
+    """
+    parsed_yaml_files = get_parsed_yaml_files(metafunc, [".yaml", ".yml"], False)
+    metafunc.parametrize("parsed_yaml_file", parsed_yaml_files)
 
 
 def parametrize_heat_templates(metafunc):
-    '''
+    """
     This param runs tests for all heat templates in the template dir
-    '''
-    heat_templates = get_filenames_lists(metafunc, ['.yaml', '.yml'],
-                                         True, 'heat')
-    metafunc.parametrize('heat_templates', heat_templates)
+    """
+    heat_templates = get_filenames_lists(metafunc, [".yaml", ".yml"], True, "heat")
+    metafunc.parametrize("heat_templates", heat_templates)
 
 
 def parametrize_heat_template(metafunc):
-    '''
+    """
     This param runs tests for every heat template in the template dir
-    '''
-    heat_templates = get_filenames_list(metafunc, ['.yaml', '.yml'],
-                                        True, 'heat')
-    metafunc.parametrize('heat_template', heat_templates)
+    """
+    heat_templates = get_filenames_list(metafunc, [".yaml", ".yml"], True, "heat")
+    metafunc.parametrize("heat_template", heat_templates)
 
 
 def parametrize_volume_templates(metafunc):
-    '''
+    """
     This param runs tests for all volume templates in the template dir
-    '''
-    volume_templates = get_filenames_lists(metafunc, ['.yaml', '.yml'],
-                                           True, 'volume')
-    metafunc.parametrize('volume_templates', volume_templates)
+    """
+    volume_templates = get_filenames_lists(metafunc, [".yaml", ".yml"], True, "volume")
+    metafunc.parametrize("volume_templates", volume_templates)
 
 
 def parametrize_volume_template(metafunc):
-    '''
+    """
 
     This param runs tests for every volume template in the template dir
-    '''
-    volume_templates = get_filenames_list(metafunc, ['.yaml', '.yml'],
-                                          True, 'volume')
-    metafunc.parametrize('volume_template', volume_templates)
+    """
+    volume_templates = get_filenames_list(metafunc, [".yaml", ".yml"], True, "volume")
+    metafunc.parametrize("volume_template", volume_templates)
 
 
 def parametrize_environment_files(metafunc):
-    '''
+    """
     This param runs tests for all environment files in the template dir
-    '''
-    env_files = get_filenames_lists(metafunc, ['.env'])
-    metafunc.parametrize('env_files', env_files)
+    """
+    env_files = get_filenames_lists(metafunc, [".env"])
+    metafunc.parametrize("env_files", env_files)
 
 
 def parametrize_environment_file(metafunc):
-    '''
+    """
     This param runs tests for every environment file in the template dir
-    '''
-    env_files = get_filenames_list(metafunc, ['.env'])
-    metafunc.parametrize('env_file', env_files)
+    """
+    env_files = get_filenames_list(metafunc, [".env"])
+    metafunc.parametrize("env_file", env_files)
 
 
 def parametrize_parsed_environment_file(metafunc):
-    '''
+    """
     This param runs tests for every parsed environment file
     in the template dir
-    '''
-    parsed_env_files = get_parsed_yaml_files(metafunc, ['.env'])
-    metafunc.parametrize('parsed_env_file', parsed_env_files)
+    """
+    parsed_env_files = get_parsed_yaml_files(metafunc, [".env"])
+    metafunc.parametrize("parsed_env_file", parsed_env_files)
 
 
 def parametrize_template_dir(metafunc):
-    '''
+    """
     This param passes a  the template_dir as passed in on CLI
     or, during --self-test, passes in the sub directories of
     template_dir/pass/ and template_dir/fail
     template_dir = get_template_dir(metafunc)
-    '''
+    """
     template_dir = get_template_dir(metafunc)
 
-    if metafunc.config.getoption('self_test'):
-        dirs = [path.join(template_dir, s, t)
-                for s in ['pass']
-                for t in listdir(path.join(template_dir, s))
-                if path.isdir(path.join(template_dir, s, t))]
-
-        dirs += [pytest.mark.xfail(path.join(template_dir, s, t))
-                 for s in ['fail']
-                 for t in listdir(path.join(template_dir, s))
-                 if path.isdir(path.join(template_dir, s, t))]
+    if metafunc.config.getoption("self_test"):
+        dirs = [
+            path.join(template_dir, s, t)
+            for s in ["pass"]
+            for t in listdir(path.join(template_dir, s))
+            if path.isdir(path.join(template_dir, s, t))
+        ]
+
+        dirs += [
+            pytest.mark.xfail(path.join(template_dir, s, t))
+            for s in ["fail"]
+            for t in listdir(path.join(template_dir, s))
+            if path.isdir(path.join(template_dir, s, t))
+        ]
     else:
         dirs = [template_dir]
 
-    metafunc.parametrize('template_dir', dirs)
+    metafunc.parametrize("template_dir", dirs)
 
 
-def parametrize_environment_pair(metafunc, template_type=''):
-    '''
+def parametrize_environment_pair(metafunc, template_type=""):
+    """
     Define a list of pairs of parsed yaml from the heat templates and
     environment files
-    '''
+    """
     pairs = []
-    if metafunc.config.getoption('self_test'):
-        sub_dirs = ['pass', 'fail']
-        env_files = list_template_dir(metafunc, ['.env'], True,
-                                      template_type, sub_dirs)
-        yaml_files = list_template_dir(metafunc, ['.yaml', '.yml'], True,
-                                       template_type, sub_dirs)
+    if metafunc.config.getoption("self_test"):
+        sub_dirs = ["pass", "fail"]
+        env_files = list_template_dir(metafunc, [".env"], True, template_type, sub_dirs)
+        yaml_files = list_template_dir(
+            metafunc, [".yaml", ".yml"], True, template_type, sub_dirs
+        )
     else:
-        env_files = list_template_dir(metafunc, ['.env'], True,
-                                      template_type)
-        yaml_files = list_template_dir(metafunc, ['.yaml', '.yml'],
-                                       True, template_type)
+        env_files = list_template_dir(metafunc, [".env"], True, template_type)
+        yaml_files = list_template_dir(metafunc, [".yaml", ".yml"], True, template_type)
 
     for filename in env_files:
         basename = path.splitext(filename)[0]
-        if basename + '.yml' in yaml_files:
-            yfilename = basename + '.yml'
+        if basename + ".yml" in yaml_files:
+            yfilename = basename + ".yml"
         else:
-            yfilename = basename + '.yaml'
+            yfilename = basename + ".yaml"
 
         try:
             with open(filename) as fh:
@@ -427,44 +401,44 @@ def parametrize_environment_pair(metafunc, template_type=''):
             with open(yfilename) as fh:
                 yyml = yaml.load(fh)
 
-            if 'fail' in filename:
-                pairs.append(pytest.mark.xfail({"name": basename,
-                                                "yyml": yyml,
-                                                "eyml": eyml},
-                             strict=True))
+            if "fail" in filename:
+                pairs.append(
+                    pytest.mark.xfail(
+                        {"name": basename, "yyml": yyml, "eyml": eyml}, strict=True
+                    )
+                )
             else:
                 pairs.append({"name": basename, "yyml": yyml, "eyml": eyml})
 
         except yaml.YAMLError as e:
             print(e)  # pylint: disable=superfluous-parens
 
-    metafunc.parametrize('environment_pair', pairs)
+    metafunc.parametrize("environment_pair", pairs)
 
 
 def parametrize_heat_volume_pair(metafunc):
-    '''
+    """
     Define a list of pairs of parsed yaml from the a heat and volume
     template
-    '''
+    """
     pairs = []
-    if metafunc.config.getoption('self_test'):
-        sub_dirs = ['pass', 'fail']
-        volume_files = list_template_dir(metafunc, ['.yaml', '.yml'],
-                                         True, 'volume', sub_dirs)
-        yaml_files = list_template_dir(metafunc, ['.yaml', '.yml'],
-                                       True, '', sub_dirs)
+    if metafunc.config.getoption("self_test"):
+        sub_dirs = ["pass", "fail"]
+        volume_files = list_template_dir(
+            metafunc, [".yaml", ".yml"], True, "volume", sub_dirs
+        )
+        yaml_files = list_template_dir(metafunc, [".yaml", ".yml"], True, "", sub_dirs)
     else:
-        volume_files = list_template_dir(metafunc, ['.yaml', '.yml'],
-                                         True, 'volume')
-        yaml_files = list_template_dir(metafunc, ['.yaml', '.yml'], True)
+        volume_files = list_template_dir(metafunc, [".yaml", ".yml"], True, "volume")
+        yaml_files = list_template_dir(metafunc, [".yaml", ".yml"], True)
 
-    pattern = re.compile(r'\_volume$')
+    pattern = re.compile(r"\_volume$")
     for vfilename in volume_files:
-        basename = pattern.sub('', path.splitext(vfilename)[0])
-        if basename + '.yml' in yaml_files:
-            yfilename = basename + '.yml'
+        basename = pattern.sub("", path.splitext(vfilename)[0])
+        if basename + ".yml" in yaml_files:
+            yfilename = basename + ".yml"
         else:
-            yfilename = basename + '.yaml'
+            yfilename = basename + ".yaml"
 
         try:
             with open(vfilename) as fh:
@@ -472,15 +446,16 @@ def parametrize_heat_volume_pair(metafunc):
             with open(yfilename) as fh:
                 yyml = yaml.load(fh)
 
-            if 'fail' in vfilename:
-                pairs.append(pytest.mark.xfail({"name": basename,
-                                                "yyml": yyml,
-                                                "vyml": vyml},
-                             strict=True))
+            if "fail" in vfilename:
+                pairs.append(
+                    pytest.mark.xfail(
+                        {"name": basename, "yyml": yyml, "vyml": vyml}, strict=True
+                    )
+                )
             else:
                 pairs.append({"name": basename, "yyml": yyml, "vyml": vyml})
 
         except yaml.YAMLError as e:
             print(e)  # pylint: disable=superfluous-parens
 
-    metafunc.parametrize('heat_volume_pair', pairs)
+    metafunc.parametrize("heat_volume_pair", pairs)
diff --git a/ice_validator/tests/structures.py b/ice_validator/tests/structures.py
index 705e35f..d10c5ea 100644
--- a/ice_validator/tests/structures.py
+++ b/ice_validator/tests/structures.py
@@ -38,8 +38,8 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''structures
-'''
+"""structures
+"""
 
 import os
 
@@ -47,7 +47,7 @@ import yaml
 
 from .utils import nested_dict
 
-VERSION = '1.4.0'
+VERSION = "1.4.0"
 
 
 class Heat(object):
@@ -55,6 +55,7 @@ class Heat(object):
     filepath - absolute path to template file.
     envpath - absolute path to environmnt file.
     """
+
     def __init__(self, filepath=None, envpath=None):
         self.filepath = None
         self.basename = None
@@ -81,14 +82,13 @@ class Heat(object):
         self.dirname = os.path.dirname(self.filepath)
         with open(self.filepath) as fi:
             self.yml = yaml.load(fi)
-        self.heat_template_version = self.yml.get('heat_template_version',
-                                                  None)
-        self.description = self.yml.get('description', '')
-        self.parameter_groups = self.yml.get('parameter_groups', {})
-        self.parameters = self.yml.get('parameters', {})
-        self.resources = self.yml.get('resources', {})
-        self.outputs = self.yml.get('outputs', {})
-        self.conditions = self.yml.get('conditions', {})
+        self.heat_template_version = self.yml.get("heat_template_version", None)
+        self.description = self.yml.get("description", "")
+        self.parameter_groups = self.yml.get("parameter_groups", {})
+        self.parameters = self.yml.get("parameters", {})
+        self.resources = self.yml.get("resources", {})
+        self.outputs = self.yml.get("outputs", {})
+        self.conditions = self.yml.get("conditions", {})
 
     def load_env(self, envpath):
         """Load the Environment template given a envpath.
@@ -105,22 +105,21 @@ class Heat(object):
 class Env(Heat):
     """An Environment file
     """
+
     pass
 
 
 class Resource(object):
     """A Resource
     """
+
     def __init__(self, resource_id=None, resource=None):
-        self.resource_id = resource_id or ''
+        self.resource_id = resource_id or ""
         self.resource = resource or {}
 
     @staticmethod
     def get_index_var(resource):
         """Return the index_var for this resource.
         """
-        index_var = nested_dict.get(
-                resource,
-                'properties',
-                'index_var') or 'index'
+        index_var = nested_dict.get(resource, "properties", "index_var") or "index"
         return index_var
diff --git a/ice_validator/tests/test_all_referenced_resources_exists.py b/ice_validator/tests/test_all_referenced_resources_exists.py
index 39247bf..e77f4f8 100644
--- a/ice_validator/tests/test_all_referenced_resources_exists.py
+++ b/ice_validator/tests/test_all_referenced_resources_exists.py
@@ -38,24 +38,24 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''test_all_referenced_resources_exists
-'''
+"""test_all_referenced_resources_exists
+"""
 
 import pytest
 import yaml
 
 from .utils.nested_iterables import find_all_get_resource_in_yml
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 # pylint: disable=invalid-name
 
 
 def test_all_referenced_resources_exists(yaml_file):
-    '''
+    """
     Check that all resources referenced by get_resource
     actually exists in all yaml files
-    '''
+    """
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
@@ -63,7 +63,7 @@ def test_all_referenced_resources_exists(yaml_file):
     if "resources" not in yml:
         pytest.skip("No resources specified in the yaml file")
 
-    resource_ids = yml['resources'].keys()
+    resource_ids = yml["resources"].keys()
     referenced_resource_ids = find_all_get_resource_in_yml(yml)
 
     missing_referenced_resources = set()
@@ -71,6 +71,6 @@ def test_all_referenced_resources_exists(yaml_file):
         if referenced_resource_id not in resource_ids:
             missing_referenced_resources.add(referenced_resource_id)
 
-    assert not missing_referenced_resources, (
-            'missing referenced resources %s' % list(
-                    missing_referenced_resources))
+    assert not missing_referenced_resources, "missing referenced resources %s" % list(
+        missing_referenced_resources
+    )
diff --git a/ice_validator/tests/test_allowed_address_pair_format.py b/ice_validator/tests/test_allowed_address_pair_format.py
index 721d5c9..816f486 100644
--- a/ice_validator/tests/test_allowed_address_pair_format.py
+++ b/ice_validator/tests/test_allowed_address_pair_format.py
@@ -38,54 +38,91 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 test_allowed_address_pairs_format
-'''
+"""
 
 import re
 
 import pytest
 import yaml
 
-from .utils.network_roles import get_network_role_from_port, \
-    property_uses_get_resource
+from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 # pylint: disable=invalid-name
 
 
 def test_allowed_address_pairs_format(heat_template):
-    '''
+    """
     Make sure all allowed_address_pairs properties follow the allowed
     naming conventions
-    '''
+    """
     allowed_formats = [
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_v6_ip')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_ip')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_floating_v6_ip')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_floating_ip')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_v6_ip_\d+')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_ip_\d+')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_v6_ip_\d+')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_ip_\d+')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "internal", re.compile(r'(.+?)_int_(.+?)_v6_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "internal", re.compile(r'(.+?)_int_(.+?)_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "external", re.compile(r'(.+?)_v6_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "external", re.compile(r'(.+?)_ips')],
-                      ]
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_floating_v6_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_floating_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "external",
+            re.compile(r"(.+?)_floating_v6_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "external",
+            re.compile(r"(.+?)_floating_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_v6_ip_\d+"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_ip_\d+"),
+        ],
+        ["allowed_address_pairs", "string", "external", re.compile(r"(.+?)_v6_ip_\d+")],
+        ["allowed_address_pairs", "string", "external", re.compile(r"(.+?)_ip_\d+")],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_v6_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "external",
+            re.compile(r"(.+?)_v6_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "external",
+            re.compile(r"(.+?)_ips"),
+        ],
+    ]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
@@ -98,17 +135,18 @@ def test_allowed_address_pairs_format(heat_template):
     invalid_allowed_address_pairs = []
 
     for v1 in yml["resources"].values():
-        if (not isinstance(v1, dict)
-                or "properties" not in v1
-                or v1.get("type") != "OS::Neutron::Port"
-                or property_uses_get_resource(v1, "network")):
+        if (
+            not isinstance(v1, dict) or
+                "properties" not in v1 or
+                v1.get("type") != "OS::Neutron::Port" or
+                property_uses_get_resource(v1, "network")
+        ):
             continue
         network_role = get_network_role_from_port(v1)
 
         v2 = v1["properties"].get("allowed_address_pairs", {})
         for v3 in v2:
-            if ("ip_address" not in v3
-                    or "get_param" not in v3["ip_address"]):
+            if "ip_address" not in v3 or "get_param" not in v3["ip_address"]:
                 continue
 
             param = v3["ip_address"]["get_param"]
@@ -119,17 +157,21 @@ def test_allowed_address_pairs_format(heat_template):
                 # check if pattern matches
                 m = v4[3].match(param)
                 if m:
-                    if (v4[2] == "internal"
-                            and len(m.groups()) > 1
-                            and m.group(2) == network_role):
+                    if (
+                        v4[2] == "internal" and
+                            len(m.groups()) > 1 and
+                            m.group(2) == network_role
+                    ):
                         break
-                    elif (v4[2] == "external"
-                            and len(m.groups()) > 0
-                            and m.group(1).endswith("_" + network_role)):
+                    elif (
+                        v4[2] == "external"
+                        and len(m.groups()) > 0
+                        and m.group(1).endswith("_" + network_role)
+                    ):
                         break
             else:
                 invalid_allowed_address_pairs.append(param)
 
-    assert not set(invalid_allowed_address_pairs), (
-            'invalid_allowed_address_pairs %s' % list(
-                    set(invalid_allowed_address_pairs)))
+    assert not set(
+        invalid_allowed_address_pairs
+    ), "invalid_allowed_address_pairs %s" % list(set(invalid_allowed_address_pairs))
diff --git a/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py b/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
index cd2e50f..7ce9c43 100644
--- a/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
+++ b/ice_validator/tests/test_allowed_address_pairs_include_vm_type_network_role.py
@@ -38,9 +38,9 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 test_allowed_address_pairs_include_vm_type_network_role
-'''
+"""
 
 import pytest
 import yaml
@@ -48,19 +48,18 @@ import yaml
 from .helpers import validates
 from .utils.ports import get_invalid_ip_addresses
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 # pylint: disable=invalid-name
 
 
-@validates('R-41492',
-           'R-35735')
+@validates("R-41492", "R-35735")
 def test_allowed_address_pairs_include_vm_type_network_role(heat_template):
-    '''
+    """
     Check that all allowed_address_pairs include the {vm_type} of the
     nova server it is associated to and also contains the
     {network_role} of the network it is associated with
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
@@ -68,9 +67,10 @@ def test_allowed_address_pairs_include_vm_type_network_role(heat_template):
     if "resources" not in yml:
         pytest.skip("No resources specified in the heat template")
 
-    invalid_ip_addresses = get_invalid_ip_addresses(yml['resources'],
-                                                    "allowed_address_pairs")
+    invalid_ip_addresses = get_invalid_ip_addresses(
+        yml["resources"], "allowed_address_pairs"
+    )
 
-    assert not set(invalid_ip_addresses), (
-            'invalid ip addresses allowed address pairs %s' % list(
-                    set(invalid_ip_addresses)))
+    assert not set(
+        invalid_ip_addresses
+    ), "invalid ip addresses allowed address pairs %s" % list(set(invalid_ip_addresses))
diff --git a/ice_validator/tests/test_availability_zone.py b/ice_validator/tests/test_availability_zone.py
index 6e0de32..4f250b8 100644
--- a/ice_validator/tests/test_availability_zone.py
+++ b/ice_validator/tests/test_availability_zone.py
@@ -47,14 +47,14 @@ import yaml
 
 from .helpers import validates
 
-VERSION = '1.1.0'
+VERSION = "1.1.0"
 
 
-@validates('R-98450')
+@validates("R-98450")
 def test_availability_zone_naming(heat_template):
-    '''
+    """
     Make sure all availability zones are properly formatted
-    '''
+    """
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
@@ -75,13 +75,13 @@ def test_availability_zone_naming(heat_template):
 
         if v1["type"] == "OS::Nova::Server":
             for k2, v2 in v1["properties"].items():
-                if k2 != 'availability_zone':
+                if k2 != "availability_zone":
                     continue
-                if 'str_replace' in v2:
+                if "str_replace" in v2:
                     continue
-                if not re.match(r'availability_zone_\d+', v2["get_param"]):
+                if not re.match(r"availability_zone_\d+", v2["get_param"]):
                     invalid_availability_zones.add(v2["get_param"])
 
-    assert not invalid_availability_zones, (
-            'invalid availability zones %s' % list(
-                    invalid_availability_zones))
+    assert not invalid_availability_zones, "invalid availability zones %s" % list(
+        invalid_availability_zones
+    )
diff --git a/ice_validator/tests/test_availability_zone_get_param.py b/ice_validator/tests/test_availability_zone_get_param.py
index 088a272..456f74b 100644
--- a/ice_validator/tests/test_availability_zone_get_param.py
+++ b/ice_validator/tests/test_availability_zone_get_param.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_base_template_names.py b/ice_validator/tests/test_base_template_names.py
index 40452ae..f9196a9 100644
--- a/ice_validator/tests/test_base_template_names.py
+++ b/ice_validator/tests/test_base_template_names.py
@@ -72,7 +72,5 @@ def test_base_template_names(template_dir):
 
         if RE_BASE.search(filename):
             base_template_count += 1
-    assert base_template_count == 1, (
-            'must be 1 "*_base_*" in %s not %d' % (
-                    filenames,
-                    base_template_count))
+    msg = 'must be 1 "*_base_*" in %s not %d' % (filenames, base_template_count)
+    assert base_template_count == 1, msg
diff --git a/ice_validator/tests/test_base_template_outputs_consumed.py b/ice_validator/tests/test_base_template_outputs_consumed.py
index fc1edc1..5d5bcd9 100644
--- a/ice_validator/tests/test_base_template_outputs_consumed.py
+++ b/ice_validator/tests/test_base_template_outputs_consumed.py
@@ -38,9 +38,9 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 test_base_template_outputs_consumed
-'''
+"""
 
 from os import path, sep
 
@@ -49,27 +49,29 @@ import yaml
 
 from .helpers import validates
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 # pylint: disable=invalid-name
 
 
-@validates('R-52753')
+@validates("R-52753")
 def test_base_template_outputs_consumed(heat_templates):
-    '''
+    """
     Check that all outputs in the base template is consumed
     by another template. The exception is the predefined output
     parameters.
-    '''
+    """
     base_template = ""
     base_template_yml = ""
     for heat_template in heat_templates:
         with open(heat_template) as fh:
             yml = yaml.load(fh)
         basename = path.splitext(heat_template)[0].rsplit(sep, 1)[1]
-        if (basename.endswith("_base")
-                or basename.startswith("base_")
-                or basename.find("_base_") > 0):
+        if (
+            basename.endswith("_base") or
+                basename.startswith("base_") or
+                basename.find("_base_") > 0
+        ):
             base_template = heat_template
             base_template_yml = yml
 
@@ -77,8 +79,7 @@ def test_base_template_outputs_consumed(heat_templates):
     if "outputs" not in base_template_yml:
         pytest.skip("No outputs specified in the base template")
 
-    predefined_outputs = ['oam_management_v4_address',
-                          'oam_management_v6_address']
+    predefined_outputs = ["oam_management_v4_address", "oam_management_v6_address"]
     base_outputs = set(base_template_yml["outputs"]) - set(predefined_outputs)
 
     # get all add-on templates
@@ -94,6 +95,6 @@ def test_base_template_outputs_consumed(heat_templates):
         parameters = yml["parameters"].keys()
         non_base_parameters.extend(parameters)
 
-    assert base_outputs <= set(non_base_parameters), (
-            'unconsumed outputs %s' % list(
-                    base_outputs - set(non_base_parameters)))
+    assert base_outputs <= set(non_base_parameters), "unconsumed outputs %s" % list(
+        base_outputs - set(non_base_parameters)
+    )
diff --git a/ice_validator/tests/test_cloud_config_resource_id.py b/ice_validator/tests/test_cloud_config_resource_id.py
index bd04e37..de82fe4 100644
--- a/ice_validator/tests/test_cloud_config_resource_id.py
+++ b/ice_validator/tests/test_cloud_config_resource_id.py
@@ -38,10 +38,10 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 A VNF's Heat Orchestration Template's Resource ``OS::Heat::CloudConfig``
 Resource ID **MUST** contain the ``{vm-type}``.
-'''
+"""
 
 import pytest
 
@@ -49,24 +49,24 @@ from .structures import Heat
 from .helpers import validates
 from .utils import vm_types
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 
-@validates('R-04747')
+@validates("R-04747")
 def test_cloud_config(heat_template):
-    '''validate resource ids
-    '''
+    """validate resource ids
+    """
     h = Heat(filepath=heat_template)
     if not h.resources:
-        pytest.skip('No resources in this template')
+        pytest.skip("No resources in this template")
 
     cloud_configs = get_cloud_configs(h)
     if not cloud_configs:
-        pytest.skip('No CloudConfig resources in this template')
+        pytest.skip("No CloudConfig resources in this template")
 
     resource_vm_types = vm_types.get_vm_types(h.resources)
     if not resource_vm_types:
-        pytest.skip('No resources with {vm-type} in this template')
+        pytest.skip("No resources with {vm-type} in this template")
 
     bad = set()
     for rid in cloud_configs:
@@ -75,13 +75,17 @@ def test_cloud_config(heat_template):
                 break
         else:
             bad.add(rid)
-    assert not bad, 'CloudConfigs %s have {vm-type} not in %s' % (
-            list(bad),
-            list(resource_vm_types))
+    assert not bad, "CloudConfigs %s have {vm-type} not in %s" % (
+        list(bad),
+        list(resource_vm_types),
+    )
 
 
 def get_cloud_configs(heat):
     """Return list of resource_id whose type is OS::Heat::CloudConfig.
     """
-    return [rid for rid, resource in heat.resources.items()
-            if heat.nested_get(resource, 'type') == 'OS::Heat::CloudConfig']
+    return [
+        rid
+        for rid, resource in heat.resources.items()
+        if heat.nested_get(resource, "type") == "OS::Heat::CloudConfig"
+    ]
diff --git a/ice_validator/tests/test_env_and_yaml_same_name.py b/ice_validator/tests/test_env_and_yaml_same_name.py
index 865845a..58b0f39 100644
--- a/ice_validator/tests/test_env_and_yaml_same_name.py
+++ b/ice_validator/tests/test_env_and_yaml_same_name.py
@@ -39,31 +39,27 @@
 #
 from .helpers import validates
 
-'''test_env_and_yaml_same_name
-'''
+"""test_env_and_yaml_same_name
+"""
 from os import listdir
 from os import path
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 
-@validates('R-67205', 'R-35727', 'R-22656')
+@validates("R-67205", "R-35727", "R-22656")
 def test_env_and_yaml_same_name(template_dir):
-    '''
+    """
     Check that all environment template filenames are identical to an
     associated Heat template filenames. Log the result of the check and add the
     filename of any environment file that is badly named.
-    '''
+    """
     files = listdir(template_dir)
-    env_files = [f for f in files
-                 if path.splitext(f)[-1] == ".env"]
-    yaml_files = [f for f in files
-                  if path.splitext(f)[-1] in ['.yml', '.yaml']]
+    env_files = [f for f in files if path.splitext(f)[-1] == ".env"]
+    yaml_files = [f for f in files if path.splitext(f)[-1] in [".yml", ".yaml"]]
     unmatched = []
     for filename in env_files:
         basename = path.splitext(filename)[0]
-        if (basename + '.yaml' not in yaml_files
-                and basename + '.yml' not in yaml_files):
+        if basename + ".yaml" not in yaml_files and basename + ".yml" not in yaml_files:
             unmatched.append(filename)
-    assert not unmatched, (
-            'files with no corresponding .y[a]ml %s' % unmatched)
+    assert not unmatched, "files with no corresponding .y[a]ml %s" % unmatched
diff --git a/ice_validator/tests/test_env_no_resource_registry.py b/ice_validator/tests/test_env_no_resource_registry.py
index 1d03d74..5d6949a 100644
--- a/ice_validator/tests/test_env_no_resource_registry.py
+++ b/ice_validator/tests/test_env_no_resource_registry.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -42,17 +42,18 @@ import yaml
 
 from .helpers import validates
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 
-@validates('R-67231')
+@validates("R-67231")
 def test_env_no_resource_registry(env_files):
-    '''
+    """
     A VNF's Heat Orchestration template's Environment File's
     **MUST NOT** contain the "resource_registry:" section.
-    '''
+    """
     for filename in env_files:
         with open(filename) as fi:
             yml = yaml.load(fi)
-        assert 'resource_registry' not in yml, (
-                '%s contains "resource_registry"' % filename)
+        assert "resource_registry" not in yml, (
+            '%s contains "resource_registry"' % filename
+        )
diff --git a/ice_validator/tests/test_environment_file_structure.py b/ice_validator/tests/test_environment_file_structure.py
index b50629e..34d3b48 100644
--- a/ice_validator/tests/test_environment_file_structure.py
+++ b/ice_validator/tests/test_environment_file_structure.py
@@ -46,68 +46,64 @@ import pytest
 
 from .helpers import validates
 
-VERSION = '1.0.0'
+VERSION = "1.0.0"
 
 # pylint: disable=invalid-name
 
 
 def test_environment_structure(env_file):
-    '''
+    """
     Check that all environments files only have the allowed sections
-    '''
-    key_values = ["parameters", "event_sinks", "encrypted_parameters",
-                  "parameter_merge_strategies"]
+    """
+    key_values = [
+        "parameters",
+        "event_sinks",
+        "encrypted_parameters",
+        "parameter_merge_strategies",
+    ]
 
     with open(env_file) as fh:
         yml = yaml.load(fh)
-    assert [k for k in key_values if k in yml], (
-            '%s missing any of %s' % (
-                    env_file,
-                    key_values))
+    assert [k for k in key_values if k in yml], "%s missing any of %s" % (
+        env_file,
+        key_values,
+    )
 
 
-@validates('R-03324')
+@validates("R-03324")
 def test_environment_file_contains_required_sections(env_file):
-    '''
+    """
     Check that all environments files only have the allowed sections
-    '''
+    """
     required_keys = ["parameters"]
 
     with open(env_file) as fh:
         yml = yaml.load(fh)
     missing_keys = [v for v in required_keys if v not in yml]
-    assert not missing_keys, '%s missing %s' % (env_file, missing_keys)
+    assert not missing_keys, "%s missing %s" % (env_file, missing_keys)
 
 
 def test_environment_file_sections_have_the_right_format(env_file):
-    '''
+    """
     Check that all environment files have sections of the right format.
     Do note that it only tests for dicts or not dicts currently.
-    '''
-    dict_keys = [
-            "parameters",
-            "encrypted_parameters",
-            "parameter_merge_strategies"]
-    not_dict_keys = [
-            "event_sinks"]
+    """
+    dict_keys = ["parameters", "encrypted_parameters", "parameter_merge_strategies"]
+    not_dict_keys = ["event_sinks"]
 
     with open(env_file) as fh:
         yml = yaml.load(fh)
 
     if not [k for k in dict_keys + not_dict_keys if k in yml]:
-        pytest.skip('The fixture is not applicable for this test')
-
-    bad_dict_keys = [k for k in dict_keys
-                     if k in yml
-                     and not isinstance(yml[k], dict)]
-    bad_not_dict_keys = [k for k in not_dict_keys
-                         if k in yml
-                         and isinstance(yml[k], dict)]
+        pytest.skip("The fixture is not applicable for this test")
+
+    bad_dict_keys = [k for k in dict_keys if k in yml and not isinstance(yml[k], dict)]
+    bad_not_dict_keys = [
+        k for k in not_dict_keys if k in yml and isinstance(yml[k], dict)
+    ]
     errors = []
     if bad_dict_keys:
-        errors.append('must be dict %s' % bad_dict_keys)
+        errors.append("must be dict %s" % bad_dict_keys)
     if bad_not_dict_keys:
-        errors.append('must not be dict %s' % bad_not_dict_keys)
-    assert not errors, '%s errors:\n    %s' % (
-            env_file,
-            '\n    '.join(errors))
+        errors.append("must not be dict %s" % bad_not_dict_keys)
+    assert not errors, "%s errors:\n    %s" % (env_file, "\n    ".join(errors))
diff --git a/ice_validator/tests/test_fixed_ips_format.py b/ice_validator/tests/test_fixed_ips_format.py
index 8e159ba..77a515e 100644
--- a/ice_validator/tests/test_fixed_ips_format.py
+++ b/ice_validator/tests/test_fixed_ips_format.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -41,8 +41,7 @@
 import pytest
 import yaml
 from .utils.ports import is_reserved_port
-from .utils.network_roles import get_network_role_from_port,\
-                                 property_uses_get_resource
+from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
 import re
 
 
@@ -52,23 +51,23 @@ def test_fixed_ips_format(heat_template):
     naming conventions
     '''
     formats = [
-              ["fixed_ips", "string", "internal",
-               re.compile(r'(.+?)_int_(.+?)_ip_\d+')],
-              ["fixed_ips", "string", "internal",
-               re.compile(r'(.+?)_int_(.+?)_v6_ip_\d+')],
-              ["fixed_ips", "string", "external",
-               re.compile(r'(.+?)_ip_\d+')],
-              ["fixed_ips", "string", "external",
-               re.compile(r'(.+?)_v6_ip_\d+')],
-              ["fixed_ips", "comma_delimited_list", "internal",
-               re.compile(r'(.+?)_int_(.+?)_ips')],
-              ["fixed_ips", "comma_delimited_list", "internal",
-               re.compile(r'(.+?)_int_(.+?)_v6_ips')],
-              ["fixed_ips", "comma_delimited_list", "external",
-               re.compile(r'(.+?)_ips')],
-              ["fixed_ips", "comma_delimited_list", "external",
-               re.compile(r'(.+?)_v6_ips')],
-              ]
+        ["fixed_ips", "string", "internal",
+         re.compile(r'(.+?)_int_(.+?)_ip_\d+')],
+        ["fixed_ips", "string", "internal",
+         re.compile(r'(.+?)_int_(.+?)_v6_ip_\d+')],
+        ["fixed_ips", "string", "external",
+         re.compile(r'(.+?)_ip_\d+')],
+        ["fixed_ips", "string", "external",
+         re.compile(r'(.+?)_v6_ip_\d+')],
+        ["fixed_ips", "comma_delimited_list", "internal",
+         re.compile(r'(.+?)_int_(.+?)_ips')],
+        ["fixed_ips", "comma_delimited_list", "internal",
+         re.compile(r'(.+?)_int_(.+?)_v6_ips')],
+        ["fixed_ips", "comma_delimited_list", "external",
+         re.compile(r'(.+?)_ips')],
+        ["fixed_ips", "comma_delimited_list", "external",
+         re.compile(r'(.+?)_v6_ips')],
+    ]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
diff --git a/ice_validator/tests/test_fixed_ips_format_use_get_param.py b/ice_validator/tests/test_fixed_ips_format_use_get_param.py
index 13f028d..df57c01 100644
--- a/ice_validator/tests/test_fixed_ips_format_use_get_param.py
+++ b/ice_validator/tests/test_fixed_ips_format_use_get_param.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -44,9 +44,9 @@ from .utils.ports import is_reserved_port
 
 
 def test_fixed_ips_format_use_get_parm(heat_template):
-    '''
+    """
     Make sure all fixed_ips properties only use get_param
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
diff --git a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
index 85c0a4d..53f6453 100644
--- a/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
+++ b/ice_validator/tests/test_fixed_ips_include_vm_type_network_role.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_get_file_only_reference_local_files.py b/ice_validator/tests/test_get_file_only_reference_local_files.py
index 6588a61..65d470c 100644
--- a/ice_validator/tests/test_get_file_only_reference_local_files.py
+++ b/ice_validator/tests/test_get_file_only_reference_local_files.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_heat_numeric_parameters.py b/ice_validator/tests/test_heat_numeric_parameters.py
index ef29987..3345e4e 100644
--- a/ice_validator/tests/test_heat_numeric_parameters.py
+++ b/ice_validator/tests/test_heat_numeric_parameters.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_heat_pairs_provided.py b/ice_validator/tests/test_heat_pairs_provided.py
index c89917e..b9c8290 100644
--- a/ice_validator/tests/test_heat_pairs_provided.py
+++ b/ice_validator/tests/test_heat_pairs_provided.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_heat_parameter_section.py b/ice_validator/tests/test_heat_parameter_section.py
index 2aab7d3..dde4176 100644
--- a/ice_validator/tests/test_heat_parameter_section.py
+++ b/ice_validator/tests/test_heat_parameter_section.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -43,16 +43,15 @@ import re
 import yaml
 
 # one or more (alphanumeric or underscore)
-RE_VALID_PARAMETER_NAME = re.compile(r'[\w_]+$')
+RE_VALID_PARAMETER_NAME = re.compile(r"[\w_]+$")
 
 
 def test_parameter_valid_keys(yaml_file):
-    '''
+    """
     Make sure each parameter is a dict and only contain
     valid keys
-    '''
-    key_values = ["type", "label", "description",
-                  "hidden", "constraints", "immutable"]
+    """
+    key_values = ["type", "label", "description", "hidden", "constraints", "immutable"]
 
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
@@ -72,11 +71,11 @@ def test_parameter_valid_keys(yaml_file):
     assert not set(invalid_params)
 
 
-@validates('R-90526')
+@validates("R-90526")
 def test_default_values(yaml_file):
-    '''
+    """
     Make sure no default values are set for any parameter.
-    '''
+    """
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
@@ -88,19 +87,19 @@ def test_default_values(yaml_file):
     for v1 in yml["parameters"].values():
         if not isinstance(v1, dict):
             continue
-        if any(k == 'default' for k in v1):
+        if any(k == "default" for k in v1):
             invalid_params.append(str(v1))
 
     assert not set(invalid_params)
 
 
-@validates('R-25877')
+@validates("R-25877")
 def test_parameter_names(yaml_file):
-    '''
+    """
     A VNF's Heat Orchestration Template's parameter name
     (i.e., <param name>) **MUST** contain only alphanumeric
     characters and underscores ('_').
-    '''
+    """
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
 
@@ -108,8 +107,7 @@ def test_parameter_names(yaml_file):
     if "parameters" not in yml:
         pytest.skip("No parameters specified in the heat template")
 
-    for key in yml['parameters']:
-        assert RE_VALID_PARAMETER_NAME.match(key), (
-                '%s parameter "%s" not alphanumeric or underscore' % (
-                        yaml_file,
-                        key))
+    for key in yml["parameters"]:
+        assert RE_VALID_PARAMETER_NAME.match(
+            key
+        ), '%s parameter "%s" not alphanumeric or underscore' % (yaml_file, key)
diff --git a/ice_validator/tests/test_heat_template_and_env_file_extension.py b/ice_validator/tests/test_heat_template_and_env_file_extension.py
index 8174c20..de83745 100644
--- a/ice_validator/tests/test_heat_template_and_env_file_extension.py
+++ b/ice_validator/tests/test_heat_template_and_env_file_extension.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_heat_template_parameters_contain_required_fields.py b/ice_validator/tests/test_heat_template_parameters_contain_required_fields.py
index 31684a5..6d9e502 100644
--- a/ice_validator/tests/test_heat_template_parameters_contain_required_fields.py
+++ b/ice_validator/tests/test_heat_template_parameters_contain_required_fields.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_heat_template_structure.py b/ice_validator/tests/test_heat_template_structure.py
index cc05df9..1e0b8c8 100644
--- a/ice_validator/tests/test_heat_template_structure.py
+++ b/ice_validator/tests/test_heat_template_structure.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -101,23 +101,23 @@ def test_heat_template_structure_sections_have_the_right_format(yaml_file):
 @validates('R-11441')
 def test_parameter_type(yaml_file):
     types = [
-            'string',
-            'number',
-            'json',
-            'comma_delimited_list',
-            'boolean',
-            ]
+        'string',
+        'number',
+        'json',
+        'comma_delimited_list',
+        'boolean',
+    ]
     with open(yaml_file) as fh:
         yml = yaml.load(fh)
     for key, param in yml.get('parameters', {}).items():
         assert isinstance(param, dict), '%s parameter %s is not dict' % (
-                yaml_file,
-                key)
+            yaml_file,
+            key)
         assert 'type' in param, '%s parameter %s has no "type"' % (
-                yaml_file,
-                key)
+            yaml_file,
+            key)
         typ = param['type']
         assert typ in types, '%s parameter %s has invalid type "%s"' % (
-                yaml_file,
-                key,
-                typ)
+            yaml_file,
+            key,
+            typ)
diff --git a/ice_validator/tests/test_heat_templates_provided.py b/ice_validator/tests/test_heat_templates_provided.py
index 187397f..168dbe0 100644
--- a/ice_validator/tests/test_heat_templates_provided.py
+++ b/ice_validator/tests/test_heat_templates_provided.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_multipart_mime_resource_id.py b/ice_validator/tests/test_multipart_mime_resource_id.py
index 58023a5..fe6fe47 100644
--- a/ice_validator/tests/test_multipart_mime_resource_id.py
+++ b/ice_validator/tests/test_multipart_mime_resource_id.py
@@ -38,10 +38,10 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 A VNF's Heat Orchestration Template's Resource ``OS::Heat::MultipartMime``
 Resource ID **MUST** contain the ``{vm-type}``.
-'''
+"""
 
 import pytest
 
@@ -49,24 +49,24 @@ from .structures import Heat
 from .helpers import validates
 from .utils import vm_types
 
-VERSION = '1.0.1'
+VERSION = "1.0.1"
 
 
-@validates('R-30804')
+@validates("R-30804")
 def test_multipart_mime(heat_template):
-    '''validate resource ids
-    '''
+    """validate resource ids
+    """
     h = Heat(filepath=heat_template)
     if not h.resources:
-        pytest.skip('No resources in this template')
+        pytest.skip("No resources in this template")
 
     multipart_mimes = get_multipart_mimes(h)
     if not multipart_mimes:
-        pytest.skip('No MultipartMime resources in this template')
+        pytest.skip("No MultipartMime resources in this template")
 
     resource_vm_types = vm_types.get_vm_types(h.resources)
     if not resource_vm_types:
-        pytest.skip('No resources with {vm-type} in this template')
+        pytest.skip("No resources with {vm-type} in this template")
 
     bad = set()
     for rid in multipart_mimes:
@@ -75,13 +75,17 @@ def test_multipart_mime(heat_template):
                 break
         else:
             bad.add(rid)
-    assert not bad, 'MultipartMime %s have {vm-type} not in %s' % (
-            list(bad),
-            list(resource_vm_types))
+    assert not bad, "MultipartMime %s have {vm-type} not in %s" % (
+        list(bad),
+        list(resource_vm_types),
+    )
 
 
 def get_multipart_mimes(heat):
     """Return list of resource_id whose type is OS::Heat::MultipartMime.
     """
-    return [rid for rid, resource in heat.resources.items()
-            if heat.nested_get(resource, 'type') == 'OS::Heat::MultipartMime']
+    return [
+        rid
+        for rid, resource in heat.resources.items()
+        if heat.nested_get(resource, "type") == "OS::Heat::MultipartMime"
+    ]
diff --git a/ice_validator/tests/test_nested_templates.py b/ice_validator/tests/test_nested_templates.py
index 12f0f34..c9caa19 100644
--- a/ice_validator/tests/test_nested_templates.py
+++ b/ice_validator/tests/test_nested_templates.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -44,12 +44,12 @@ from os import path
 from .utils.nested_files import get_list_of_nested_files
 
 
-@validates('R-70276')
+@validates("R-70276")
 def test_all_nested_templates_provided(yaml_files):
-    '''
+    """
     Check that all templates marked as volume templates are
     in fact volume templates
-    '''
+    """
     nested_yaml_files = []
 
     for yaml_file in yaml_files:
@@ -57,13 +57,13 @@ def test_all_nested_templates_provided(yaml_files):
             yml = yaml.load(fh)
         if "resources" not in yml:
             continue
-        nested_yaml_files.extend(get_list_of_nested_files(
-                yml["resources"], path.dirname(yaml_file)))
+        nested_yaml_files.extend(
+            get_list_of_nested_files(yml["resources"], path.dirname(yaml_file))
+        )
 
     # detect all provided nested files
-    provided_nested_yaml_files = [f1
-                                  for f1 in nested_yaml_files
-                                  for f2 in yaml_files
-                                  if f1 in f2]
+    provided_nested_yaml_files = [
+        f1 for f1 in nested_yaml_files for f2 in yaml_files if f1 in f2
+    ]
 
     assert set(provided_nested_yaml_files) == set(nested_yaml_files)
diff --git a/ice_validator/tests/test_nested_templates_invalid_nesting.py b/ice_validator/tests/test_nested_templates_invalid_nesting.py
index 00d6d25..edd5ca3 100644
--- a/ice_validator/tests/test_nested_templates_invalid_nesting.py
+++ b/ice_validator/tests/test_nested_templates_invalid_nesting.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -56,8 +56,8 @@ def test_valid_nesting(yaml_files):
         if "resources" not in yml:
             continue
         invalid_nesting.extend(check_for_invalid_nesting(
-                yml["resources"],
-                yaml_file,
-                path.dirname(yaml_file)))
+            yml["resources"],
+            yaml_file,
+            path.dirname(yaml_file)))
 
     assert not set(invalid_nesting)
diff --git a/ice_validator/tests/test_network_format.py b/ice_validator/tests/test_network_format.py
index 651267e..4bd13ad 100644
--- a/ice_validator/tests/test_network_format.py
+++ b/ice_validator/tests/test_network_format.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -41,8 +41,7 @@ from .helpers import validates
 
 import pytest
 import yaml
-from .utils.network_roles import get_network_role_from_port,\
-                                 property_uses_get_resource
+from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
 
 
 @validates('R-62983', 'R-86182')
diff --git a/ice_validator/tests/test_network_format_use_get_param_or_get_resource.py b/ice_validator/tests/test_network_format_use_get_param_or_get_resource.py
index e30b344..a1b3b06 100644
--- a/ice_validator/tests/test_network_format_use_get_param_or_get_resource.py
+++ b/ice_validator/tests/test_network_format_use_get_param_or_get_resource.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_no_unused_parameters_between_env_and_templates.py b/ice_validator/tests/test_no_unused_parameters_between_env_and_templates.py
index 4845751..781f35d 100644
--- a/ice_validator/tests/test_no_unused_parameters_between_env_and_templates.py
+++ b/ice_validator/tests/test_no_unused_parameters_between_env_and_templates.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_nova_servergroup_policies.py b/ice_validator/tests/test_nova_servergroup_policies.py
index a3bdf5a..6915fd4 100644
--- a/ice_validator/tests/test_nova_servergroup_policies.py
+++ b/ice_validator/tests/test_nova_servergroup_policies.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_nova_servers_correct_parameter_types.py b/ice_validator/tests/test_nova_servers_correct_parameter_types.py
index a71ee4a..8364d38 100644
--- a/ice_validator/tests/test_nova_servers_correct_parameter_types.py
+++ b/ice_validator/tests/test_nova_servers_correct_parameter_types.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -53,15 +53,15 @@ def test_nova_servers_correct_parameter_types(heat_template):
     '''
     key_values = ["name", "flavor", "image"]
     key_value_formats = [
-                        ["name", "string",
-                            re.compile(r'(.+?)_name_\d+')],
-                        ["name", "comma_delimited_list",
-                            re.compile(r'(.+?)_names')],
-                        ["flavor", "string",
-                            re.compile(r'(.+?)_flavor_name')],
-                        ["image", "string",
-                            re.compile(r'(.+?)_image_name')],
-                        ]
+        ["name", "string",
+         re.compile(r'(.+?)_name_\d+')],
+        ["name", "comma_delimited_list",
+         re.compile(r'(.+?)_names')],
+        ["flavor", "string",
+         re.compile(r'(.+?)_flavor_name')],
+        ["image", "string",
+         re.compile(r'(.+?)_image_name')],
+    ]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
diff --git a/ice_validator/tests/test_nova_servers_index.py b/ice_validator/tests/test_nova_servers_index.py
index 3ca99a0..85ce335 100644
--- a/ice_validator/tests/test_nova_servers_index.py
+++ b/ice_validator/tests/test_nova_servers_index.py
@@ -38,11 +38,11 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
-'''
+"""
 Ensure that if a resource_id has an {index}, then all resources of
 the same vm-type have an index, the indices are consecutive and start
 with 0.
-'''
+"""
 
 import collections
 import re
@@ -53,15 +53,15 @@ from .structures import Heat
 from .helpers import validates
 from .utils import vm_types
 
-VERSION = '1.1.0'
+VERSION = "1.1.0"
 
-RE_INDEXED_RESOURCE_ID = re.compile(r'\w+_(?P<index>\d+)$')
+RE_INDEXED_RESOURCE_ID = re.compile(r"\w+_(?P<index>\d+)$")
 
 
-@validates('R-11690')
+@validates("R-11690")
 def test_indices(heat_templates):
-    '''validate indices
-    '''
+    """validate indices
+    """
     indexed_resource_ids = {}
     resources = {}
     for heat_template in heat_templates:
@@ -70,14 +70,14 @@ def test_indices(heat_templates):
             indexed_resource_ids.update(get_indexed_resource_ids(h.resources))
             resources.update(h.resources)
     if not resources:
-        pytest.skip('No resources found')
+        pytest.skip("No resources found")
 
     if not indexed_resource_ids:
-        pytest.skip('No resources with {index} found')
+        pytest.skip("No resources with {index} found")
 
     types = get_types(resources, indexed_resource_ids)
     if not types:
-        pytest.skip('No resources with {vm-type} found')
+        pytest.skip("No resources with {vm-type} found")
 
     indices = collections.defaultdict(list)
     for resource_id, vm_type in types.items():
@@ -89,10 +89,18 @@ def test_indices(heat_templates):
                 bad[vm_type] = index_list
                 break
     assert not bad, (
-            'vm-type indices must be consecutive, unique,'
-            ' and start at 0.\n    %s' % (
-                    '\n    '.join(['Resource ID %s: VM Type: %s' % (x, y)
-                                   for x, y in types.items() if y in bad])))
+        "vm-type indices must be consecutive, unique,"
+        " and start at 0.\n    %s"
+        % (
+            "\n    ".join(
+                [
+                    "Resource ID %s: VM Type: %s" % (x, y)
+                    for x, y in types.items()
+                    if y in bad
+                ]
+            )
+        )
+    )
 
 
 def get_indexed_resource_ids(resources):
@@ -103,7 +111,7 @@ def get_indexed_resource_ids(resources):
     for resource in resources:
         match = RE_INDEXED_RESOURCE_ID.match(resource)
         if match:
-            indexed_resource_ids[resource] = int(match.groupdict()['index'])
+            indexed_resource_ids[resource] = int(match.groupdict()["index"])
     return indexed_resource_ids
 
 
diff --git a/ice_validator/tests/test_nova_servers_resource_ids.py b/ice_validator/tests/test_nova_servers_resource_ids.py
index 3f588dc..d35fce5 100644
--- a/ice_validator/tests/test_nova_servers_resource_ids.py
+++ b/ice_validator/tests/test_nova_servers_resource_ids.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -44,11 +44,11 @@ from .helpers import validates
 from .utils.vm_types import get_vm_type_for_nova_server
 
 
-@validates('R-01455', 'R-48067', 'R-00977')
+@validates("R-01455", "R-48067", "R-00977")
 def test_nova_servers_valid_resource_ids(heat_template):
-    '''
+    """
     Make sure all nova servers have valid resource ids
-    '''
+    """
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
@@ -71,7 +71,7 @@ def test_nova_servers_valid_resource_ids(heat_template):
             continue
         vm_type = vm_type.lower()
 
-        if vm_type+"_" not in k1.lower():
+        if vm_type + "_" not in k1.lower():
             invalid_nova_servers.append(k1)
 
     assert not set(invalid_nova_servers)
diff --git a/ice_validator/tests/test_nova_servers_vm_types.py b/ice_validator/tests/test_nova_servers_vm_types.py
index 9511ecd..48abe04 100644
--- a/ice_validator/tests/test_nova_servers_vm_types.py
+++ b/ice_validator/tests/test_nova_servers_vm_types.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
index 2be7e6f..79bc4b2 100644
--- a/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
+++ b/ice_validator/tests/test_nova_servers_vm_types_use_get_param.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_parse_yaml.py b/ice_validator/tests/test_parse_yaml.py
index 5246f33..637e93d 100644
--- a/ice_validator/tests/test_parse_yaml.py
+++ b/ice_validator/tests/test_parse_yaml.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_port_resource_ids.py b/ice_validator/tests/test_port_resource_ids.py
index a6f7093..511af35 100644
--- a/ice_validator/tests/test_port_resource_ids.py
+++ b/ice_validator/tests/test_port_resource_ids.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -43,29 +43,33 @@ import pytest
 import yaml
 from .helpers import validates
 from .utils.vm_types import get_vm_type_for_nova_server
-from .utils.network_roles import get_network_role_from_port,\
-                                 get_network_type_from_port,\
-                                 property_uses_get_resource
-
-
-@validates('R-29865',
-           'R-69014',
-           'R-05201',
-           'R-68936',
-           'R-32025',
-           'R-11168',
-           'R-84322',
-           'R-96983',
-           'R-26506',
-           'R-20453',
-           'R-26351')
+from .utils.network_roles import (
+    get_network_role_from_port,
+    get_network_type_from_port,
+    property_uses_get_resource,
+)
+
+
+@validates(
+    "R-29865",
+    "R-69014",
+    "R-05201",
+    "R-68936",
+    "R-32025",
+    "R-11168",
+    "R-84322",
+    "R-96983",
+    "R-26506",
+    "R-20453",
+    "R-26351",
+)
 def test_port_resource_ids(heat_template):
-    '''
+    """
     Check that all resource ids for ports follow the right
     naming convention to include the {vm_type} of the
     nova server it is associated to and also contains the
     {network_role} of the network it is associated with
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
@@ -74,22 +78,22 @@ def test_port_resource_ids(heat_template):
         pytest.skip("No resources specified in the heat template")
 
     port_patterns = {
-                    'internal': re.compile(r'(.+?)_\d+_int_(.+?)_port_\d+'),
-                    'external': re.compile(r'(.+?)_\d+_(.+?)_port_\d+'),
-                    }
-    resources = yml['resources']
+        "internal": re.compile(r"(.+?)_\d+_int_(.+?)_port_\d+"),
+        "external": re.compile(r"(.+?)_\d+_(.+?)_port_\d+"),
+    }
+    resources = yml["resources"]
 
     invalid_ports = []
     for k, v in resources.items():
         if not isinstance(v, dict):
             continue
-        if 'type' not in v:
+        if "type" not in v:
             continue
-        if v['type'] not in 'OS::Nova::Server':
+        if v["type"] not in "OS::Nova::Server":
             continue
-        if 'properties' not in v:
+        if "properties" not in v:
             continue
-        if 'networks' not in v['properties']:
+        if "networks" not in v["properties"]:
             continue
 
         has_vm_type = False
@@ -102,18 +106,18 @@ def test_port_resource_ids(heat_template):
         vm_type = vm_type.lower()
 
         # get all ports associated with the nova server
-        properties = v['properties']
-        for v2 in properties['networks']:
+        properties = v["properties"]
+        for v2 in properties["networks"]:
             for k3, v3 in v2.items():
-                if k3 != 'port':
+                if k3 != "port":
                     continue
                 if not isinstance(v3, dict):
                     continue
 
-                if 'get_param' in v3:
+                if "get_param" in v3:
                     continue
-                elif 'get_resource' in v3:
-                    port_id = v3['get_resource']
+                elif "get_resource" in v3:
+                    port_id = v3["get_resource"]
                     if not resources[port_id]:
                         continue
                     port_resource = resources[port_id]
@@ -121,7 +125,7 @@ def test_port_resource_ids(heat_template):
                 else:
                     continue
 
-                has_vm_type = vm_type+"_" in port_id
+                has_vm_type = vm_type + "_" in port_id
                 has_network_role = False
 
                 if port_resource:
@@ -141,9 +145,9 @@ def test_port_resource_ids(heat_template):
                 else:
                     # match the assumed naming convention for ports
                     # if the specified port is provided via get_param
-                    network_type = 'external'
+                    network_type = "external"
                     if "int_" in port_id:
-                        network_type = 'internal'
+                        network_type = "internal"
                     if port_patterns[network_type].match(port_id):
                         has_network_role = True
 
diff --git a/ice_validator/tests/test_referenced_and_defined_parameters_match.py b/ice_validator/tests/test_referenced_and_defined_parameters_match.py
index d31831f..918d396 100644
--- a/ice_validator/tests/test_referenced_and_defined_parameters_match.py
+++ b/ice_validator/tests/test_referenced_and_defined_parameters_match.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_required_parameters_no_constraints.py b/ice_validator/tests/test_required_parameters_no_constraints.py
index 247eab6..9e89191 100644
--- a/ice_validator/tests/test_required_parameters_no_constraints.py
+++ b/ice_validator/tests/test_required_parameters_no_constraints.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_required_parameters_specified_in_env_files.py b/ice_validator/tests/test_required_parameters_specified_in_env_files.py
index f60f8d7..15894c3 100644
--- a/ice_validator/tests/test_required_parameters_specified_in_env_files.py
+++ b/ice_validator/tests/test_required_parameters_specified_in_env_files.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_required_parameters_specified_in_heat_templates.py b/ice_validator/tests/test_required_parameters_specified_in_heat_templates.py
index d86a22b..bbfcf2d 100644
--- a/ice_validator/tests/test_required_parameters_specified_in_heat_templates.py
+++ b/ice_validator/tests/test_required_parameters_specified_in_heat_templates.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_reserve_port_fixed_ips_format.py b/ice_validator/tests/test_reserve_port_fixed_ips_format.py
index 42d9a61..5b28d06 100644
--- a/ice_validator/tests/test_reserve_port_fixed_ips_format.py
+++ b/ice_validator/tests/test_reserve_port_fixed_ips_format.py
@@ -51,15 +51,15 @@ def test_reserve_port_fixed_ips_format(heat_template):
     follow the allowed naming conventions
     '''
     allowed_formats = [
-                      ["fixed_ips", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_v6_ip')],
-                      ["fixed_ips", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_ip')],
-                      ["fixed_ips", "string", "external",
-                       re.compile(r'(.+?)_floating_v6_ip')],
-                      ["fixed_ips", "string", "external",
-                       re.compile(r'(.+?)_floating_ip')],
-                      ]
+        ["fixed_ips", "string", "internal",
+         re.compile(r'(.+?)_int_(.+?)_floating_v6_ip')],
+        ["fixed_ips", "string", "internal",
+         re.compile(r'(.+?)_int_(.+?)_floating_ip')],
+        ["fixed_ips", "string", "external",
+         re.compile(r'(.+?)_floating_v6_ip')],
+        ["fixed_ips", "string", "external",
+         re.compile(r'(.+?)_floating_ip')],
+    ]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
diff --git a/ice_validator/tests/test_resource_ids_alphanumeric_only.py b/ice_validator/tests/test_resource_ids_alphanumeric_only.py
index c124ea7..8342520 100644
--- a/ice_validator/tests/test_resource_ids_alphanumeric_only.py
+++ b/ice_validator/tests/test_resource_ids_alphanumeric_only.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_servers_have_optional_metadata.py b/ice_validator/tests/test_servers_have_optional_metadata.py
index 0e72e6c..de40fdf 100644
--- a/ice_validator/tests/test_servers_have_optional_metadata.py
+++ b/ice_validator/tests/test_servers_have_optional_metadata.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_servers_have_required_metadata.py b/ice_validator/tests/test_servers_have_required_metadata.py
index 9d10fc9..3a12b9d 100644
--- a/ice_validator/tests/test_servers_have_required_metadata.py
+++ b/ice_validator/tests/test_servers_have_required_metadata.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_servers_metadata_use_get_param.py b/ice_validator/tests/test_servers_metadata_use_get_param.py
index c2d1d54..1b5f869 100644
--- a/ice_validator/tests/test_servers_metadata_use_get_param.py
+++ b/ice_validator/tests/test_servers_metadata_use_get_param.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_subnet_format.py b/ice_validator/tests/test_subnet_format.py
index e5f28cc..51b513c 100644
--- a/ice_validator/tests/test_subnet_format.py
+++ b/ice_validator/tests/test_subnet_format.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -40,26 +40,21 @@
 
 import pytest
 import yaml
-from .utils.network_roles import get_network_role_from_port,\
-                                 property_uses_get_resource
+from .utils.network_roles import get_network_role_from_port, property_uses_get_resource
 import re
 
 
 def test_subnet_format(heat_template):
-    '''
+    """
     Make sure all subnet properties follow the allowed naming
     conventions
-    '''
+    """
     formats = [
-              ["subnet_id", "string", "internal",
-               re.compile(r'int_(.+?)_subnet_id')],
-              ["subnet_id", "string", "internal",
-               re.compile(r'int_(.+?)_v6_subnet_id')],
-              ["subnet_id", "string", "external",
-               re.compile(r'(.+?)_subnet_id')],
-              ["subnet_id", "string", "external",
-               re.compile(r'(.+?)_v6_subnet_id')],
-              ]
+        ["subnet_id", "string", "internal", re.compile(r"int_(.+?)_subnet_id")],
+        ["subnet_id", "string", "internal", re.compile(r"int_(.+?)_v6_subnet_id")],
+        ["subnet_id", "string", "external", re.compile(r"(.+?)_subnet_id")],
+        ["subnet_id", "string", "external", re.compile(r"(.+?)_v6_subnet_id")],
+    ]
 
     with open(heat_template) as fh:
         yml = yaml.load(fh)
@@ -87,9 +82,9 @@ def test_subnet_format(heat_template):
             continue
 
         # define the network_type
-        network_type = 'external'
-        if network_param.startswith('int_'):
-            network_type = 'internal'
+        network_type = "external"
+        if network_param.startswith("int_"):
+            network_type = "internal"
 
         for k2, v2 in v1["properties"].items():
             if k2 != "fixed_ips":
diff --git a/ice_validator/tests/test_subnet_format_use_get_param_or_get_resource.py b/ice_validator/tests/test_subnet_format_use_get_param_or_get_resource.py
index 597dd22..b462ef5 100644
--- a/ice_validator/tests/test_subnet_format_use_get_param_or_get_resource.py
+++ b/ice_validator/tests/test_subnet_format_use_get_param_or_get_resource.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_unique_name_resources.py b/ice_validator/tests/test_unique_name_resources.py
index a89dd1d..df803dd 100644
--- a/ice_validator/tests/test_unique_name_resources.py
+++ b/ice_validator/tests/test_unique_name_resources.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_unique_name_str_replace_use_params_in_tmpl.py b/ice_validator/tests/test_unique_name_str_replace_use_params_in_tmpl.py
index 80397b1..fed7e90 100644
--- a/ice_validator/tests/test_unique_name_str_replace_use_params_in_tmpl.py
+++ b/ice_validator/tests/test_unique_name_str_replace_use_params_in_tmpl.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_unique_name_str_replace_use_req_params.py b/ice_validator/tests/test_unique_name_str_replace_use_req_params.py
index d89d8d9..00df3b5 100644
--- a/ice_validator/tests/test_unique_name_str_replace_use_req_params.py
+++ b/ice_validator/tests/test_unique_name_str_replace_use_req_params.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_unique_resources_across_all_templates.py b/ice_validator/tests/test_unique_resources_across_all_templates.py
index 2d05147..d8fd066 100644
--- a/ice_validator/tests/test_unique_resources_across_all_templates.py
+++ b/ice_validator/tests/test_unique_resources_across_all_templates.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_unique_resources_across_template.py b/ice_validator/tests/test_unique_resources_across_template.py
index 9ed8927..6bfc43c 100644
--- a/ice_validator/tests/test_unique_resources_across_template.py
+++ b/ice_validator/tests/test_unique_resources_across_template.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_vm_type_resource_id.py b/ice_validator/tests/test_vm_type_resource_id.py
index 9a47656..39a11ef 100644
--- a/ice_validator/tests/test_vm_type_resource_id.py
+++ b/ice_validator/tests/test_vm_type_resource_id.py
@@ -68,7 +68,6 @@ def test_vm_type_resource_id(heat_template):
     for rid in h.resources:
         lower_rid = rid.lower()
         for vm_type, lower_vm_type in vm_types.items():
-            if (lower_rid.startswith(lower_vm_type)
-               and not rid.startswith(vm_type)):
-                    bad[rid] = vm_type
+            if lower_rid.startswith(lower_vm_type) and not rid.startswith(vm_type):
+                bad[rid] = vm_type
     assert not bad, 'resource_id which do not match their vm-type %s' % bad
diff --git a/ice_validator/tests/test_volume_format_outputs.py b/ice_validator/tests/test_volume_format_outputs.py
index 02ab9c2..3a00275 100644
--- a/ice_validator/tests/test_volume_format_outputs.py
+++ b/ice_validator/tests/test_volume_format_outputs.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_volume_outputs_consumed.py b/ice_validator/tests/test_volume_outputs_consumed.py
index 648a689..3ee7178 100644
--- a/ice_validator/tests/test_volume_outputs_consumed.py
+++ b/ice_validator/tests/test_volume_outputs_consumed.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_volume_resource_ids.py b/ice_validator/tests/test_volume_resource_ids.py
index a6a7334..45b05e7 100644
--- a/ice_validator/tests/test_volume_resource_ids.py
+++ b/ice_validator/tests/test_volume_resource_ids.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -45,11 +45,11 @@ from .utils.vm_types import get_vm_type_for_nova_server
 
 
 def test_volume_resource_ids(heat_template):
-    '''
+    """
     Check that all resource ids for cinder volumes follow the right
     naming convention to include the {vm_type} of the
     nova server it is associated to
-    '''
+    """
     with open(heat_template) as fh:
         yml = yaml.load(fh)
 
@@ -57,25 +57,24 @@ def test_volume_resource_ids(heat_template):
     if "resources" not in yml:
         pytest.skip("No resources specified in the heat template")
 
-    volume_pattern = re.compile(r'(.+?)_volume_id_\d+')
-    resources = yml['resources']
+    volume_pattern = re.compile(r"(.+?)_volume_id_\d+")
+    resources = yml["resources"]
 
     invalid_volumes = []
     for k, v in resources.items():
         if not isinstance(v, dict):
             continue
-        if 'type' not in v:
+        if "type" not in v:
             continue
-        if v['type'] not in ['OS::Nova::Server',
-                             'OS::Cinder::VolumeAttachment']:
+        if v["type"] not in ["OS::Nova::Server", "OS::Cinder::VolumeAttachment"]:
             continue
 
-        if v['type'] == 'OS::Nova::Server':
+        if v["type"] == "OS::Nova::Server":
             # check block_device_mapping and make sure the right
             # {vm_type} is used
-            if 'properties' not in v:
+            if "properties" not in v:
                 continue
-            if 'block_device_mapping' not in v['properties']:
+            if "block_device_mapping" not in v["properties"]:
                 continue
 
             vm_type = get_vm_type_for_nova_server(v)
@@ -84,17 +83,15 @@ def test_volume_resource_ids(heat_template):
             vm_type = vm_type.lower()
 
             # get the volume_id from the block_device_mapping
-            properties = v['properties']
-            for v2 in properties['block_device_mapping']:
+            properties = v["properties"]
+            for v2 in properties["block_device_mapping"]:
                 for k3, v3 in v2.items():
-                    if k3 != 'volume_id':
+                    if k3 != "volume_id":
                         continue
                     if not isinstance(v3, dict):
                         continue
 
-                    volume_id = (
-                        v3.get('get_param') or
-                        v3.get('get_resource'))
+                    volume_id = v3.get("get_param") or v3.get("get_resource")
                     if not volume_id:
                         continue
                     if isinstance(volume_id, list):
@@ -102,30 +99,30 @@ def test_volume_resource_ids(heat_template):
                     else:
                         volume_id = volume_id.lower()
 
-                    if vm_type+"_" not in volume_id:
+                    if vm_type + "_" not in volume_id:
                         invalid_volumes.append(volume_id)
 
-        elif v['type'] == 'OS::Cinder::VolumeAttachment':
+        elif v["type"] == "OS::Cinder::VolumeAttachment":
             # check the volume attachment and the {vm_type}
             # of the corresponding nova server
-            if 'properties' not in v:
+            if "properties" not in v:
                 continue
-            if 'volume_id' not in v['properties']:
+            if "volume_id" not in v["properties"]:
                 continue
-            if 'instance_uuid' not in v['properties']:
+            if "instance_uuid" not in v["properties"]:
                 continue
 
-            properties = v['properties']
+            properties = v["properties"]
 
             # get the instance_uuid and when applicable
             # the nova server instance
             instance_uuid = None
             nova_server = None
 
-            if 'get_param' in properties['instance_uuid']:
+            if "get_param" in properties["instance_uuid"]:
                 continue
-            elif 'get_resource' in properties['instance_uuid']:
-                instance_uuid = properties['instance_uuid']['get_resource']
+            elif "get_resource" in properties["instance_uuid"]:
+                instance_uuid = properties["instance_uuid"]["get_resource"]
                 if not resources[instance_uuid]:
                     continue
                 nova_server = resources[instance_uuid]
@@ -135,9 +132,9 @@ def test_volume_resource_ids(heat_template):
 
             # get the volume_id
             volume_id = None
-            volume_id = (
-                properties['volume_id'].get('get_param') or
-                properties['volume_id'].get('get_resource'))
+            volume_id = properties["volume_id"].get("get_param") or properties[
+                "volume_id"
+            ].get("get_resource")
             if not volume_id:
                 continue
             if isinstance(volume_id, list):
@@ -155,14 +152,14 @@ def test_volume_resource_ids(heat_template):
                 if not vm_type:
                     continue
                 vm_type = vm_type.lower()
-                if vm_type+"_" not in volume_id:
+                if vm_type + "_" not in volume_id:
                     invalid_volumes.append(volume_id)
             else:
                 # extract the assumed {vm_type} from volume_id
                 m = volume_pattern.match(volume_id)
                 if m:
                     vm_type = m.group(1).lower()
-                    if vm_type+"_" not in instance_uuid:
+                    if vm_type + "_" not in instance_uuid:
                         invalid_volumes.append(volume_id)
                 else:
                     continue
diff --git a/ice_validator/tests/test_volume_templates.py b/ice_validator/tests/test_volume_templates.py
index d30ee19..191ae9d 100644
--- a/ice_validator/tests/test_volume_templates.py
+++ b/ice_validator/tests/test_volume_templates.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_volume_templates_outputs.py b/ice_validator/tests/test_volume_templates_outputs.py
index 975afb7..f18f1cd 100644
--- a/ice_validator/tests/test_volume_templates_outputs.py
+++ b/ice_validator/tests/test_volume_templates_outputs.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/test_volume_templates_outputs_resources.py b/ice_validator/tests/test_volume_templates_outputs_resources.py
index 85a9d02..90096e3 100644
--- a/ice_validator/tests/test_volume_templates_outputs_resources.py
+++ b/ice_validator/tests/test_volume_templates_outputs_resources.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/utils/__init__.py b/ice_validator/tests/utils/__init__.py
index e8f24cd..ec11176 100644
--- a/ice_validator/tests/utils/__init__.py
+++ b/ice_validator/tests/utils/__init__.py
@@ -2,11 +2,11 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the “License”);
+# under the Apache License, Version 2.0 (the "License");
 # you may not use this software except in compliance with the License.
 # You may obtain a copy of the License at
 #
@@ -21,7 +21,7 @@
 #
 #
 # Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
 # you may not use this documentation except in compliance with the License.
 # You may obtain a copy of the License at
 #
diff --git a/ice_validator/tests/utils/nested_files.py b/ice_validator/tests/utils/nested_files.py
index 39306eb..02f733d 100644
--- a/ice_validator/tests/utils/nested_files.py
+++ b/ice_validator/tests/utils/nested_files.py
@@ -45,15 +45,15 @@ from os import path
 import re
 import yaml
 
-VERSION = '1.0.2'
+VERSION = "1.0.2"
 
 
 def get_list_of_nested_files(yml, dirpath):
-    '''
+    """
     return a list of all nested files
-    '''
+    """
 
-    if not hasattr(yml, 'items'):
+    if not hasattr(yml, "items"):
         return []
 
     nested_files = []
@@ -68,34 +68,29 @@ def get_list_of_nested_files(yml, dirpath):
                 nested_files.append(filepath)
                 nested_files.extend(get_list_of_nested_files(t_yml, dirpath))
             elif t == "OS::Heat::ResourceGroup":
-                rdt = (v.get("properties", {})
-                        .get("resource_def", {})
-                        .get("type", None))
+                rdt = v.get("properties", {}).get("resource_def", {}).get("type", None)
                 if rdt and (rdt.endswith(".yml") or rdt.endswith(".yaml")):
                     filepath = path.join(dirpath, rdt)
                     with open(filepath) as fh:
                         rdt_yml = yaml.load(fh)
                     nested_files.append(filepath)
-                    nested_files.extend(
-                        get_list_of_nested_files(rdt_yml, dirpath))
+                    nested_files.extend(get_list_of_nested_files(rdt_yml, dirpath))
         if isinstance(v, dict):
-            nested_files.extend(
-                get_list_of_nested_files(v, dirpath))
+            nested_files.extend(get_list_of_nested_files(v, dirpath))
         elif isinstance(v, list):
             for d in v:
-                nested_files.extend(
-                    get_list_of_nested_files(d, dirpath))
+                nested_files.extend(get_list_of_nested_files(d, dirpath))
     return nested_files
 
 
 def check_for_invalid_nesting(yml, yaml_file, dirpath):
-    '''
+    """
     return a list of all nested files
-    '''
-    if not hasattr(yml, 'items'):
+    """
+    if not hasattr(yml, "items"):
         return []
     invalid_nesting = []
-    p = re.compile('^[A-z]*::[A-z]*::[A-z]*$')
+    p = re.compile("^[A-z]*::[A-z]*::[A-z]*$")
 
     for v in yml.values():
         if isinstance(v, dict) and "type" in v:
@@ -108,8 +103,8 @@ def check_for_invalid_nesting(yml, yaml_file, dirpath):
                     invalid_nesting.append(yaml_file)
                     continue
                 elif not p.match(rd["type"]) and not (
-                        rd["type"].endswith(".yml")
-                        or rd["type"].endswith(".yaml")):
+                    rd["type"].endswith(".yml") or rd["type"].endswith(".yaml")
+                ):
                     filepath = path.join(dirpath, rd["type"])
                 else:
                     continue
@@ -120,20 +115,11 @@ def check_for_invalid_nesting(yml, yaml_file, dirpath):
                     yml = yaml.load(fh)
             except yaml.YAMLError as e:
                 invalid_nesting.append(filepath)
-                print(e)    # pylint: disable=superfluous-parens
-            invalid_nesting.extend(check_for_invalid_nesting(
-                    yml,
-                    filepath,
-                    dirpath))
+                print(e)  # pylint: disable=superfluous-parens
+            invalid_nesting.extend(check_for_invalid_nesting(yml, filepath, dirpath))
         if isinstance(v, dict):
-            invalid_nesting.extend(check_for_invalid_nesting(
-                    v,
-                    yaml_file,
-                    dirpath))
+            invalid_nesting.extend(check_for_invalid_nesting(v, yaml_file, dirpath))
         elif isinstance(v, list):
             for d in v:
-                invalid_nesting.extend(check_for_invalid_nesting(
-                        d,
-                        yaml_file,
-                        dirpath))
+                invalid_nesting.extend(check_for_invalid_nesting(d, yaml_file, dirpath))
     return invalid_nesting
diff --git a/ice_validator/tests/utils/network_roles.py b/ice_validator/tests/utils/network_roles.py
index 3f8d6b8..d4b2cce 100644
--- a/ice_validator/tests/utils/network_roles.py
+++ b/ice_validator/tests/utils/network_roles.py
@@ -43,37 +43,31 @@ import socket
 
 
 def get_network_role_from_port(resource):
-    '''
+    """
     get the network role from a neutron port resource
-    '''
+    """
     if not isinstance(resource, dict):
         return None
-    if 'type' not in resource:
+    if "type" not in resource:
         return None
-    if resource['type'] != 'OS::Neutron::Port':
+    if resource["type"] != "OS::Neutron::Port":
         return None
-    if 'properties' not in resource:
+    if "properties" not in resource:
         return None
 
     formats = [
-              ["network", "string", "internal",
-               re.compile(r'int_(.+?)_net_id')],
-              ["network", "string", "internal",
-               re.compile(r'int_(.+?)_net_name')],
-              ["network", "string", "external",
-               re.compile(r'(.+?)_net_id')],
-              ["network", "string", "external",
-               re.compile(r'(.+?)_net_name')],
-              ]
+        ["network", "string", "internal", re.compile(r"int_(.+?)_net_id")],
+        ["network", "string", "internal", re.compile(r"int_(.+?)_net_name")],
+        ["network", "string", "external", re.compile(r"(.+?)_net_id")],
+        ["network", "string", "external", re.compile(r"(.+?)_net_name")],
+    ]
 
     for k1, v1 in resource["properties"].items():
-        if k1 != 'network':
+        if k1 != "network":
             continue
 
         # get the network id or name
-        network = (
-            v1.get('get_param') or
-            v1.get('get_resource'))
+        network = v1.get("get_param") or v1.get("get_resource")
         if not network:
             continue
 
@@ -86,31 +80,27 @@ def get_network_role_from_port(resource):
 
 
 def get_network_type_from_port(resource):
-    '''
+    """
     get the network type from a neutron port resource
-    '''
+    """
     if not isinstance(resource, dict):
         return None
-    if 'type' not in resource:
+    if "type" not in resource:
         return None
-    if resource['type'] != 'OS::Neutron::Port':
+    if resource["type"] != "OS::Neutron::Port":
         return None
-    if 'properties' not in resource:
+    if "properties" not in resource:
         return None
 
     formats = [
-              ["network", "string", "internal",
-               re.compile(r'int_(.+?)_net_id')],
-              ["network", "string", "internal",
-               re.compile(r'int_(.+?)_net_name')],
-              ["network", "string", "external",
-               re.compile(r'(.+?)_net_id')],
-              ["network", "string", "external",
-               re.compile(r'(.+?)_net_name')],
-              ]
+        ["network", "string", "internal", re.compile(r"int_(.+?)_net_id")],
+        ["network", "string", "internal", re.compile(r"int_(.+?)_net_name")],
+        ["network", "string", "external", re.compile(r"(.+?)_net_id")],
+        ["network", "string", "external", re.compile(r"(.+?)_net_name")],
+    ]
 
     for k1, v1 in resource["properties"].items():
-        if k1 != 'network':
+        if k1 != "network":
             continue
         if "get_param" not in v1:
             continue
@@ -122,22 +112,22 @@ def get_network_type_from_port(resource):
     return None
 
 
-def is_valid_ip_address(ip_address, ip_type='ipv4'):
-    '''
+def is_valid_ip_address(ip_address, ip_type="ipv4"):
+    """
     check if an ip address is valid
-    '''
-    if ip_type == 'ipv4':
+    """
+    if ip_type == "ipv4":
         return is_valid_ipv4_address(ip_address)
-    elif ip_type == 'ipv6':
+    elif ip_type == "ipv6":
         return is_valid_ipv6_address(ip_address)
     return False
 
 
 def is_valid_ipv4_address(ip_address):
-    '''
+    """
     check if an ip address of the type ipv4
     is valid
-    '''
+    """
     try:
         socket.inet_pton(socket.AF_INET, ip_address)
     except AttributeError:
@@ -145,17 +135,17 @@ def is_valid_ipv4_address(ip_address):
             socket.inet_aton(ip_address)
         except (OSError, socket.error):
             return False
-        return ip_address.count('.') == 3
+        return ip_address.count(".") == 3
     except (OSError, socket.error):
         return False
     return True
 
 
 def is_valid_ipv6_address(ip_address):
-    '''
+    """
     check if an ip address of the type ipv6
     is valid
-    '''
+    """
     try:
         socket.inet_pton(socket.AF_INET6, ip_address)
     except (OSError, socket.error):
@@ -164,13 +154,13 @@ def is_valid_ipv6_address(ip_address):
 
 
 def property_uses_get_resource(resource, property_name):
-    '''
+    """
     returns true if a port's network property
     uses the get_resource function
-    '''
+    """
     if not isinstance(resource, dict):
         return False
-    if 'properties' not in resource:
+    if "properties" not in resource:
         return False
     for k1, v1 in resource["properties"].items():
         if k1 != property_name:
diff --git a/ice_validator/tests/utils/ports.py b/ice_validator/tests/utils/ports.py
index c9d4be9..e479201 100644
--- a/ice_validator/tests/utils/ports.py
+++ b/ice_validator/tests/utils/ports.py
@@ -44,53 +44,93 @@ import re
 
 
 def is_valid_ip_address(ip_address, vm_type, network_role, port_property):
-    '''
+    """
     Check the ip_address to make sure it is properly formatted and
     also contains {vm_type} and {network_role}
-    '''
+    """
 
     allowed_formats = [
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_v6_ip')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_floating_ip')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_floating_v6_ip')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_floating_ip')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_v6_ip_\d+')],
-                      ["allowed_address_pairs", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_ip_\d+')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_v6_ip_\d+')],
-                      ["allowed_address_pairs", "string", "external",
-                       re.compile(r'(.+?)_ip_\d+')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "internal", re.compile(r'(.+?)_int_(.+?)_v6_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "internal", re.compile(r'(.+?)_int_(.+?)_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "external", re.compile(r'(.+?)_v6_ips')],
-                      ["allowed_address_pairs", "comma_delimited_list",
-                       "external", re.compile(r'(.+?)_ips')],
-                      ["fixed_ips", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_v6_ip_\d+')],
-                      ["fixed_ips", "string", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_ip_\d+')],
-                      ["fixed_ips", "string", "external",
-                       re.compile(r'(.+?)_v6_ip_\d+')],
-                      ["fixed_ips", "string", "external",
-                       re.compile(r'(.+?)_ip_\d+')],
-                      ["fixed_ips", "comma_delimited_list", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_v6_ips')],
-                      ["fixed_ips", "comma_delimited_list", "internal",
-                       re.compile(r'(.+?)_int_(.+?)_ips')],
-                      ["fixed_ips", "comma_delimited_list", "external",
-                       re.compile(r'(.+?)_v6_ips')],
-                      ["fixed_ips", "comma_delimited_list", "external",
-                       re.compile(r'(.+?)_ips')],
-                      ]
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_floating_v6_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_floating_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "external",
+            re.compile(r"(.+?)_floating_v6_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "external",
+            re.compile(r"(.+?)_floating_ip"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_v6_ip_\d+"),
+        ],
+        [
+            "allowed_address_pairs",
+            "string",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_ip_\d+"),
+        ],
+        ["allowed_address_pairs", "string", "external", re.compile(r"(.+?)_v6_ip_\d+")],
+        ["allowed_address_pairs", "string", "external", re.compile(r"(.+?)_ip_\d+")],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_v6_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "external",
+            re.compile(r"(.+?)_v6_ips"),
+        ],
+        [
+            "allowed_address_pairs",
+            "comma_delimited_list",
+            "external",
+            re.compile(r"(.+?)_ips"),
+        ],
+        ["fixed_ips", "string", "internal", re.compile(r"(.+?)_int_(.+?)_v6_ip_\d+")],
+        ["fixed_ips", "string", "internal", re.compile(r"(.+?)_int_(.+?)_ip_\d+")],
+        ["fixed_ips", "string", "external", re.compile(r"(.+?)_v6_ip_\d+")],
+        ["fixed_ips", "string", "external", re.compile(r"(.+?)_ip_\d+")],
+        [
+            "fixed_ips",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_v6_ips"),
+        ],
+        [
+            "fixed_ips",
+            "comma_delimited_list",
+            "internal",
+            re.compile(r"(.+?)_int_(.+?)_ips"),
+        ],
+        ["fixed_ips", "comma_delimited_list", "external", re.compile(r"(.+?)_v6_ips")],
+        ["fixed_ips", "comma_delimited_list", "external", re.compile(r"(.+?)_ips")],
+    ]
 
     for v3 in allowed_formats:
         if v3[0] != port_property:
@@ -98,33 +138,30 @@ def is_valid_ip_address(ip_address, vm_type, network_role, port_property):
         # check if pattern matches
         m = v3[3].match(ip_address)
         if m:
-            if (v3[2] == "internal" and
-                    len(m.groups()) > 1):
-                    return m.group(1) == vm_type and\
-                        m.group(2) == network_role
-            elif (v3[2] == "external" and
-                  len(m.groups()) > 0):
+            if v3[2] == "internal" and len(m.groups()) > 1:
+                return m.group(1) == vm_type and m.group(2) == network_role
+            elif v3[2] == "external" and len(m.groups()) > 0:
                 return m.group(1) == vm_type + "_" + network_role
 
     return False
 
 
 def get_invalid_ip_addresses(resources, port_property):
-    '''
+    """
     Get a list of valid ip addresses for a heat resources section
-    '''
+    """
     invalid_ip_addresses = []
 
     for k, v in resources.items():
         if not isinstance(v, dict):
             continue
-        if 'type' not in v:
+        if "type" not in v:
             continue
-        if v['type'] not in 'OS::Nova::Server':
+        if v["type"] not in "OS::Nova::Server":
             continue
-        if 'properties' not in v:
+        if "properties" not in v:
             continue
-        if 'networks' not in v['properties']:
+        if "networks" not in v["properties"]:
             continue
 
         port_resource = None
@@ -134,16 +171,16 @@ def get_invalid_ip_addresses(resources, port_property):
             continue
 
         # get all ports associated with the nova server
-        properties = v['properties']
-        for network in properties['networks']:
+        properties = v["properties"]
+        for network in properties["networks"]:
             for k3, v3 in network.items():
-                if k3 != 'port':
+                if k3 != "port":
                     continue
                 if not isinstance(v3, dict):
                     continue
 
-                if 'get_resource' in v3:
-                    port_id = v3['get_resource']
+                if "get_resource" in v3:
+                    port_id = v3["get_resource"]
                     if not resources[port_id]:
                         continue
                     port_resource = resources[port_id]
@@ -168,10 +205,9 @@ def get_invalid_ip_addresses(resources, port_property):
                         if isinstance(ip_address, list):
                             ip_address = ip_address[0]
 
-                        valid_ip_address = is_valid_ip_address(ip_address,
-                                                               vm_type,
-                                                               network_role,
-                                                               port_property)
+                        valid_ip_address = is_valid_ip_address(
+                            ip_address, vm_type, network_role, port_property
+                        )
 
                         if not valid_ip_address:
                             invalid_ip_addresses.append(ip_address)
@@ -180,16 +216,14 @@ def get_invalid_ip_addresses(resources, port_property):
 
 
 def is_reserved_port(port_id):
-    '''
+    """
     Checks to see if the resource id for a port follows
     the reserve port concept
-    '''
+    """
     formats = [
-            ["port_id",
-             re.compile(r'reserve_port_(.+?)_floating_ip_\d+')],
-            ["port_id",
-             re.compile(r'reserve_port_(.+?)_floating_v6_ip_\d+')],
-            ]
+        ["port_id", re.compile(r"reserve_port_(.+?)_floating_ip_\d+")],
+        ["port_id", re.compile(r"reserve_port_(.+?)_floating_v6_ip_\d+")],
+    ]
     for f in formats:
         m = f[1].match(port_id.lower())
         if m and m.group(1):
diff --git a/ice_validator/tests/utils/vm_types.py b/ice_validator/tests/utils/vm_types.py
index 41da7d9..78006b9 100644
--- a/ice_validator/tests/utils/vm_types.py
+++ b/ice_validator/tests/utils/vm_types.py
@@ -42,37 +42,33 @@ import re
 
 
 def get_vm_types_for_resource(resource):
-    '''
+    """
     Get all unique vm_types for a resource
     Notes:
     - Returns set([]) if the resource is not formatted
     properly, the passed resource is not a nova server
     - If more than one vm_type is detected all vm_types will
     be returned
-    '''
+    """
     if not isinstance(resource, dict):
         return set()
-    if 'type' not in resource:
+    if "type" not in resource:
         return set()
-    if resource['type'] != 'OS::Nova::Server':
+    if resource["type"] != "OS::Nova::Server":
         return set()
-    if 'properties' not in resource:
+    if "properties" not in resource:
         return set()
 
     key_values = ["name", "flavor", "image"]
     key_value_formats = [
-                        ["name", "string",
-                         re.compile(r'(.+?)_name_\d+')],
-                        ["name", "comma_delimited_list",
-                         re.compile(r'(.+?)_names')],
-                        ["flavor", "string",
-                         re.compile(r'(.+?)_flavor_name')],
-                        ["image", "string",
-                         re.compile(r'(.+?)_image_name')],
-                        ]
+        ["name", "string", re.compile(r"(.+?)_name_\d+")],
+        ["name", "comma_delimited_list", re.compile(r"(.+?)_names")],
+        ["flavor", "string", re.compile(r"(.+?)_flavor_name")],
+        ["image", "string", re.compile(r"(.+?)_image_name")],
+    ]
 
     vm_types = []
-    for k2, v2 in resource['properties'].items():
+    for k2, v2 in resource["properties"].items():
         if k2 not in key_values:
             continue
         if "get_param" not in v2:
@@ -90,12 +86,12 @@ def get_vm_types_for_resource(resource):
 
 
 def get_vm_type_for_nova_server(resource):
-    '''
+    """
     Get the vm_type for a resource
     Note: Returns None if not exactly one vm_type
     is detected, if the resource is not formatted properly, or
     the passed resource is not a nova server
-    '''
+    """
     vm_types = get_vm_types_for_resource(resource)
 
     # if more than one vm_type was identified, return None
@@ -106,10 +102,10 @@ def get_vm_type_for_nova_server(resource):
 
 
 def get_vm_types(resources):
-    '''
+    """
     Get all vm_types for a list of heat resources, do note that
     some of the values retrieved may be invalid
-    '''
+    """
     vm_types = []
     for v in resources.values():
         vm_types.extend(list(get_vm_types_for_resource(v)))
-- 
cgit 1.2.3-korg