Migrated to netapp.aws

533 files changed, 0 insertions, 33834 deletions

diff --git a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_FileSystems.py b/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_FileSystems.py
deleted file mode 100644
index 8007a57247..0000000000
--- a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_FileSystems.py
+++ /dev/null
@@ -1,360 +0,0 @@
-#!/usr/bin/python
-
-# (c) 2019, NetApp Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""AWS Cloud Volumes Services - Manage fileSystem"""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = '''
-
-module: aws_netapp_cvs_FileSystems
-
-short_description: NetApp AWS Cloud Volumes Service Manage FileSystem.
-extends_documentation_fragment:
-    - netapp.awscvs
-version_added: '2.9'
-author: NetApp Ansible Team (@carchi8py) <ng-ansibleteam@netapp.com>
-description:
-- Create, Update, Delete fileSystem on AWS Cloud Volumes Service.
-
-options:
-  state:
-    description:
-    - Whether the specified fileSystem should exist or not.
-    required: true
-    choices: ['present', 'absent']
-    type: str
-
-  region:
-    description:
-    - The region to which the filesystem belongs to.
-    required: true
-    type: str
-
-  creationToken:
-    description:
-    - Name of the filesystem
-    required: true
-    type: str
-
-  quotaInBytes:
-    description:
-    - Size of the filesystem
-    - Required for create
-    type: int
-
-  serviceLevel:
-    description:
-    - Service Level of a filesystem.
-    choices: ['standard', 'premium', 'extreme']
-    type: str
-
-  exportPolicy:
-    description:
-    - The policy rules to export the filesystem
-    type: dict
-    suboptions:
-        rules:
-            description:
-            - Set of rules to export the filesystem
-            - Requires allowedClients, access and protocol
-            type: list
-            suboptions:
-                allowedClients:
-                  description:
-                  - Comma separated list of ip address blocks of the clients to access the fileSystem
-                  - Each address block contains the starting IP address and size for the block
-                  type: str
-
-                cifs:
-                  description:
-                  - Enable or disable cifs filesystem
-                  type: bool
-
-                nfsv3:
-                  description:
-                  - Enable or disable nfsv3 fileSystem
-                  type: bool
-
-                nfsv4:
-                  description:
-                  - Enable or disable nfsv4 filesystem
-                  type: bool
-
-                ruleIndex:
-                  description:
-                  - Index number of the rule
-                  type: int
-
-                unixReadOnly:
-                  description:
-                  - Should fileSystem have read only permission or not
-                  type: bool
-
-                unixReadWrite:
-                  description:
-                  - Should fileSystem have read write permission or not
-                  type: bool
-'''
-
-EXAMPLES = """
-- name: Create FileSystem
-  aws_netapp_cvs_FileSystems:
-    state: present
-    region: us-east-1
-    creationToken: newVolume-1
-    exportPolicy:
-        rules:
-          - allowedClients: 172.16.0.4
-            cifs: False
-            nfsv3: True
-            nfsv4: True
-            ruleIndex: 1
-            unixReadOnly: True
-            unixReadWrite: False
-    quotaInBytes: 100000000000
-    api_url : cds-aws-bundles.netapp.com
-    api_key: Q1ZRR0p0VGNuZ3VhMnJBYk5zczM1RkZ3Z0lCbUE3
-    secret_key : U1FwdHdKSGRQQUhIdkIwMktMU1ZCV2x6WUowZWRD
-
-- name: Update FileSystem
-  aws_netapp_cvs_FileSystems:
-     state: present
-     region: us-east-1
-     creationToken: newVolume-1
-     exportPolicy:
-         rules:
-           - allowedClients: 172.16.0.4
-             cifs: False
-             nfsv3: True
-             nfsv4: True
-             ruleIndex: 1
-             unixReadOnly: True
-             unixReadWrite: False
-     quotaInBytes: 200000000000
-     api_url : cds-aws-bundles.netapp.com
-     api_key: Q1ZRR0p0VGNuZ3VhMnJBYk5zczM1RkZ3Z0lCbUE3
-     secret_key : U1FwdHdKSGRQQUhIdkIwMktMU1ZCV2x6WUowZWRD
-
-- name: Delete FileSystem
-  aws_netapp_cvs_FileSystems:
-     state: present
-     region: us-east-1
-     creationToken: newVolume-1
-     quotaInBytes: 100000000000
-     api_url : cds-aws-bundles.netapp.com
-     api_key: Q1ZRR0p0VGNuZ3VhMnJBYk5zczM1RkZ3Z0lCbUE3
-     secret_key : U1FwdHdKSGRQQUhIdkIwMktMU1ZCV2x6WUowZWRD
-"""
-
-RETURN = """
-"""
-
-import ansible.module_utils.netapp as netapp_utils
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.netapp_module import NetAppModule
-from ansible.module_utils.netapp import AwsCvsRestAPI
-
-
-class AwsCvsNetappFileSystem(object):
-    """
-    Contains methods to parse arguments,
-    derive details of AWS_CVS objects
-    and send requests to AWS CVS via
-    the restApi
-    """
-
-    def __init__(self):
-        """
-        Parse arguments, setup state variables,
-        check parameters and ensure request module is installed
-        """
-        self.argument_spec = netapp_utils.aws_cvs_host_argument_spec()
-        self.argument_spec.update(dict(
-            state=dict(required=True, choices=['present', 'absent']),
-            region=dict(required=True, type='str'),
-            creationToken=dict(required=True, type='str'),
-            quotaInBytes=dict(required=False, type='int'),
-            serviceLevel=dict(required=False, choices=['standard', 'premium', 'extreme']),
-            exportPolicy=dict(
-                type='dict',
-                options=dict(
-                    rules=dict(
-                        type='list',
-                        options=dict(
-                            allowedClients=dict(required=False, type='str'),
-                            cifs=dict(required=False, type='bool'),
-                            nfsv3=dict(required=False, type='bool'),
-                            nfsv4=dict(required=False, type='bool'),
-                            ruleIndex=dict(required=False, type='int'),
-                            unixReadOnly=dict(required=False, type='bool'),
-                            unixReadWrite=dict(required=False, type='bool')
-                        )
-                    )
-                )
-            ),
-        ))
-
-        self.module = AnsibleModule(
-            argument_spec=self.argument_spec,
-            required_if=[
-                ('state', 'present', ['region', 'creationToken', 'quotaInBytes']),
-            ],
-            supports_check_mode=True
-        )
-
-        self.na_helper = NetAppModule()
-
-        # set up state variables
-        self.parameters = self.na_helper.set_parameters(self.module.params)
-
-        # Calling generic AWSCVS restApi class
-        self.restApi = AwsCvsRestAPI(self.module)
-
-        self.data = {}
-        for key in self.parameters.keys():
-            self.data[key] = self.parameters[key]
-
-    def get_filesystemId(self):
-        # Check given FileSystem is exists
-        # Return fileSystemId is found, None otherwise
-        list_filesystem, error = self.restApi.get('FileSystems')
-        if error:
-            self.module.fail_json(msg=error)
-
-        for FileSystem in list_filesystem:
-            if FileSystem['creationToken'] == self.parameters['creationToken']:
-                return FileSystem['fileSystemId']
-        return None
-
-    def get_filesystem(self, fileSystemId):
-        # Get FileSystem information by fileSystemId
-        # Return fileSystem Information
-        filesystemInfo, error = self.restApi.get('FileSystems/%s' % fileSystemId)
-        if error:
-            self.module.fail_json(msg=error)
-        else:
-            return filesystemInfo
-        return None
-
-    def is_job_done(self, response):
-        # check jobId is present and equal to 'done'
-        # return True on success, False otherwise
-        try:
-            job_id = response['jobs'][0]['jobId']
-        except TypeError:
-            job_id = None
-
-        if job_id is not None and self.restApi.get_state(job_id) == 'done':
-            return True
-        return False
-
-    def create_fileSystem(self):
-        # Create fileSystem
-        api = 'FileSystems'
-        response, error = self.restApi.post(api, self.data)
-        if not error:
-            if self.is_job_done(response):
-                return
-            error = "Error: unexpected response on FileSystems create: %s" % str(response)
-        self.module.fail_json(msg=error)
-
-    def delete_fileSystem(self, fileSystemId):
-        # Delete FileSystem
-        api = 'FileSystems/' + fileSystemId
-        self.data = None
-        response, error = self.restApi.delete(api, self.data)
-        if not error:
-            if self.is_job_done(response):
-                return
-            error = "Error: unexpected response on FileSystems delete: %s" % str(response)
-        self.module.fail_json(msg=error)
-
-    def update_fileSystem(self, fileSystemId):
-        # Update FileSystem
-        api = 'FileSystems/' + fileSystemId
-        response, error = self.restApi.put(api, self.data)
-        if not error:
-            if self.is_job_done(response):
-                return
-            error = "Error: unexpected response on FileSystems update: %s" % str(response)
-        self.module.fail_json(msg=error)
-
-    def apply(self):
-        """
-        Perform pre-checks, call functions and exit
-        """
-
-        fileSystem = None
-        fileSystemId = self.get_filesystemId()
-
-        if fileSystemId:
-            # Getting the FileSystem details
-            fileSystem = self.get_filesystem(fileSystemId)
-
-        cd_action = self.na_helper.get_cd_action(fileSystem, self.parameters)
-
-        if cd_action is None and self.parameters['state'] == 'present':
-            # Check if we need to update the fileSystem
-            update_fileSystem = False
-            if fileSystem['quotaInBytes'] is not None and 'quotaInBytes' in self.parameters \
-                    and fileSystem['quotaInBytes'] != self.parameters['quotaInBytes']:
-                update_fileSystem = True
-            elif fileSystem['creationToken'] is not None and 'creationToken' in self.parameters \
-                    and fileSystem['creationToken'] != self.parameters['creationToken']:
-                update_fileSystem = True
-            elif fileSystem['serviceLevel'] is not None and 'serviceLevel' in self.parameters \
-                    and fileSystem['serviceLevel'] != self.parameters['serviceLevel']:
-                update_fileSystem = True
-            elif fileSystem['exportPolicy']['rules'] is not None and 'exportPolicy' in self.parameters:
-                for rule_org in fileSystem['exportPolicy']['rules']:
-                    for rule in self.parameters['exportPolicy']['rules']:
-                        if rule_org['allowedClients'] != rule['allowedClients']:
-                            update_fileSystem = True
-                        elif rule_org['unixReadOnly'] != rule['unixReadOnly']:
-                            update_fileSystem = True
-                        elif rule_org['unixReadWrite'] != rule['unixReadWrite']:
-                            update_fileSystem = True
-
-            if update_fileSystem:
-                self.na_helper.changed = True
-
-        result_message = ""
-
-        if self.na_helper.changed:
-            if self.module.check_mode:
-                # Skip changes
-                result_message = "Check mode, skipping changes"
-            else:
-                if cd_action == "create":
-                    self.create_fileSystem()
-                    result_message = "FileSystem Created"
-                elif cd_action == "delete":
-                    self.delete_fileSystem(fileSystemId)
-                    result_message = "FileSystem Deleted"
-                else:   # modify
-                    self.update_fileSystem(fileSystemId)
-                    result_message = "FileSystem Updated"
-        self.module.exit_json(changed=self.na_helper.changed, msg=result_message)
-
-
-def main():
-    """
-    Main function
-    """
-    aws_cvs_netapp_filesystem = AwsCvsNetappFileSystem()
-    aws_cvs_netapp_filesystem.apply()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_active_directory.py b/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_active_directory.py
deleted file mode 100644
index 9d9f914263..0000000000
--- a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_active_directory.py
+++ /dev/null
@@ -1,269 +0,0 @@
-#!/usr/bin/python
-
-# (c) 2019, NetApp Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""AWS Cloud Volumes Services - Manage ActiveDirectory"""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'certified'}
-
-
-DOCUMENTATION = '''
-
-module: aws_netapp_cvs_active_directory
-
-short_description: NetApp AWS CloudVolumes Service Manage Active Directory.
-extends_documentation_fragment:
-    - netapp.awscvs
-version_added: '2.9'
-author: NetApp Ansible Team (@carchi8py) <ng-ansibleteam@netapp.com>
-description:
-    - Create, Update, Delete ActiveDirectory on AWS Cloud Volumes Service.
-
-options:
-  state:
-     description:
-         - Whether the specified ActiveDirectory should exist or not.
-     choices: ['present', 'absent']
-     required: true
-     type: str
-
-  region:
-    description:
-    - The region to which the Active Directory credentials are associated.
-    required: true
-    type: str
-
-  domain:
-    description:
-    - Name of the Active Directory domain.
-    - Required when I(state=present).
-    type: str
-
-  DNS:
-    description:
-    - DNS server address for the Active Directory domain.
-    - Required when I(state=present), to modify ActiveDirectory properties.
-    type: str
-
-  netBIOS:
-    description:
-    - NetBIOS name of the server.
-    type: str
-
-  username:
-    description:
-    - Username of the Active Directory domain administrator.
-    type: str
-
-  password:
-    description:
-    - Password of the Active Directory domain administrator.
-    type: str
-'''
-
-EXAMPLES = """
-    - name: Create Active Directory
-      aws_netapp_cvs_active_directory.py:
-        state: present
-        region: us-east-1
-        DNS: 101.102.103.123
-        domain: mydomain.com
-        password: netapp1!
-        netBIOS: testing
-        username: user1
-        api_url : My_CVS_Hostname
-        api_key: My_API_Key
-        secret_key : My_Secret_Key
-
-    - name: Update Active Directory
-      aws_netapp_cvs_active_directory.py:
-        state: present
-        region: us-east-1
-        DNS: 101.102.103.123
-        domain: mydomain.com
-        password: netapp2!
-        netBIOS: testingBIOS
-        username: user2
-        api_url : My_CVS_Hostname
-        api_key: My_API_Key
-        secret_key : My_Secret_Key
-
-    - name: Delete Active Directory
-      aws_netapp_cvs_active_directory.py:
-        state: absent
-        region: us-east-1
-        domain: mydomain.com
-        api_url : My_CVS_Hostname
-        api_key: My_API_Key
-        secret_key : My_Secret_Key
-"""
-
-RETURN = '''
-'''
-
-import ansible.module_utils.netapp as netapp_utils
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.netapp_module import NetAppModule
-from ansible.module_utils.netapp import AwsCvsRestAPI
-
-
-class AwsCvsNetappActiveDir(object):
-    """
-    Contains methods to parse arguments,
-    derive details of AWS_CVS objects
-    and send requests to AWS CVS via
-    the restApi
-    """
-
-    def __init__(self):
-        """
-        Parse arguments, setup state variables,
-        check paramenters and ensure request module is installed
-        """
-        self.argument_spec = netapp_utils.aws_cvs_host_argument_spec()
-        self.argument_spec.update(dict(
-            state=dict(required=True, choices=['present', 'absent'], type='str'),
-            region=dict(required=True, type='str'),
-            DNS=dict(required=False, type='str'),
-            domain=dict(required=False, type='str'),
-            password=dict(required=False, type='str', no_log=True),
-            netBIOS=dict(required=False, type='str'),
-            username=dict(required=False, type='str')
-        ))
-
-        self.module = AnsibleModule(
-            argument_spec=self.argument_spec,
-            required_if=[
-                ('state', 'present', ['region', 'domain']),
-            ],
-            supports_check_mode=True
-        )
-
-        self.na_helper = NetAppModule()
-
-        # set up state variables
-        self.parameters = self.na_helper.set_parameters(self.module.params)
-        # Calling generic AWSCVS restApi class
-        self.restApi = AwsCvsRestAPI(self.module)
-
-    def get_activedirectoryId(self):
-        # Check if  ActiveDirectory exists
-        # Return UUID for ActiveDirectory is found, None otherwise
-        try:
-            list_activedirectory, error = self.restApi.get('Storage/ActiveDirectory')
-        except Exception as e:
-            return None
-
-        for ActiveDirectory in list_activedirectory:
-            if ActiveDirectory['region'] == self.parameters['region']:
-                return ActiveDirectory['UUID']
-        return None
-
-    def get_activedirectory(self, activeDirectoryId=None):
-        if activeDirectoryId is None:
-            return None
-        else:
-            ActiveDirectoryInfo, error = self.restApi.get('Storage/ActiveDirectory/%s' % activeDirectoryId)
-            if not error:
-                return ActiveDirectoryInfo
-            return None
-
-    def create_activedirectory(self):
-        # Create ActiveDirectory
-        api = 'Storage/ActiveDirectory'
-        data = {"region": self.parameters['region'], "DNS": self.parameters['DNS'], "domain": self.parameters['domain'],
-                "username": self.parameters['username'], "password": self.parameters['password'], "netBIOS": self.parameters['netBIOS']}
-
-        response, error = self.restApi.post(api, data)
-
-        if not error:
-            return response
-        else:
-            self.module.fail_json(msg=response['message'])
-
-    def delete_activedirectory(self):
-        activedirectoryId = self.get_activedirectoryId()
-        # Delete ActiveDirectory
-
-        if activedirectoryId:
-            api = 'Storage/ActiveDirectory/' + activedirectoryId
-            data = None
-            response, error = self.restApi.delete(api, data)
-            if not error:
-                return response
-            else:
-                self.module.fail_json(msg=response['message'])
-
-        else:
-            self.module.fail_json(msg="Active Directory does not exist")
-
-    def update_activedirectory(self, activedirectoryId, updated_activedirectory):
-        # Update ActiveDirectory
-        api = 'Storage/ActiveDirectory/' + activedirectoryId
-        data = {
-            "region": self.parameters['region'],
-            "DNS": updated_activedirectory['DNS'],
-            "domain": updated_activedirectory['domain'],
-            "username": updated_activedirectory['username'],
-            "password": updated_activedirectory['password'],
-            "netBIOS": updated_activedirectory['netBIOS']
-        }
-
-        response, error = self.restApi.put(api, data)
-        if not error:
-            return response
-        else:
-            self.module.fail_json(msg=response['message'])
-
-    def apply(self):
-        """
-        Perform pre-checks, call functions and exit
-        """
-        modify = False
-        activeDirectoryId = self.get_activedirectoryId()
-        current = self.get_activedirectory(activeDirectoryId)
-        cd_action = self.na_helper.get_cd_action(current, self.parameters)
-
-        if current and self.parameters['state'] != 'absent':
-            keys_to_check = ['DNS', 'domain', 'username', 'password', 'netBIOS']
-            updated_active_directory, modify = self.na_helper.compare_and_update_values(current, self.parameters, keys_to_check)
-
-            if modify is True:
-                self.na_helper.changed = True
-                if 'domain' in self.parameters and self.parameters['domain'] is not None:
-                    ad_exists = self.get_activedirectory(updated_active_directory['domain'])
-                    if ad_exists:
-                        modify = False
-                        self.na_helper.changed = False
-
-        if self.na_helper.changed:
-            if self.module.check_mode:
-                pass
-            else:
-                if modify is True:
-                    self.update_activedirectory(activeDirectoryId, updated_active_directory)
-                elif cd_action == 'create':
-                    self.create_activedirectory()
-                elif cd_action == 'delete':
-                    self.delete_activedirectory()
-
-        self.module.exit_json(changed=self.na_helper.changed)
-
-
-def main():
-    """
-    Main function
-    """
-    aws_netapp_cvs_active_directory = AwsCvsNetappActiveDir()
-    aws_netapp_cvs_active_directory.apply()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_pool.py b/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_pool.py
deleted file mode 100644
index d1b5f9aaa7..0000000000
--- a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_pool.py
+++ /dev/null
@@ -1,267 +0,0 @@
-#!/usr/bin/python
-
-# (c) 2019, NetApp Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""AWS Cloud Volumes Services - Manage Pools"""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = '''
-
-module: aws_netapp_cvs_pool
-
-short_description: NetApp AWS Cloud Volumes Service Manage Pools.
-extends_documentation_fragment:
-    - netapp.awscvs
-version_added: '2.9'
-author: NetApp Ansible Team (@carchi8py) <ng-ansibleteam@netapp.com>
-description:
-    - Create, Update, Delete Pool on AWS Cloud Volumes Service.
-
-options:
-    state:
-        description:
-        - Whether the specified pool should exist or not.
-        choices: ['present', 'absent']
-        required: true
-        type: str
-    region:
-        description:
-        - The region to which the Pool is associated.
-        required: true
-        type: str
-    name:
-        description:
-        - pool name ( The human readable name of the Pool )
-        - name can be used for create, update and delete operations
-        required: true
-        type: str
-    serviceLevel:
-        description:
-        - The service level of the Pool
-        - can be used with pool create, update operations
-        choices: ['basic', 'standard', 'extreme']
-        type: str
-    sizeInBytes:
-        description:
-        - Size of the Pool in bytes
-        - can be used with pool create, update operations
-        - minimum value is 4000000000000 bytes
-        type: int
-    vendorID:
-        description:
-        - A vendor ID for the Pool. E.g. an ID allocated by a vendor service for the Pool.
-        - can be used with pool create, update operations
-        - must be unique
-        type: str
-    from_name:
-        description:
-        - rename the existing pool name ( The human readable name of the Pool )
-        - I(from_name) is the existing name, and I(name) the new name
-        - can be used with update operation
-        type: str
-'''
-
-EXAMPLES = """
-- name: Create a new Pool
-  aws_netapp_cvs_pool:
-    state: present
-    name: TestPoolBB12
-    serviceLevel: extreme
-    sizeInBytes: 4000000000000
-    vendorID: ansiblePoolTestVendorBB12
-    region: us-east-1
-    api_url: cds-aws-bundles.netapp.com
-    api_key: MyAPiKey
-    secret_key: MySecretKey
-
-- name: Delete a Pool
-  aws_netapp_cvs_pool:
-    state: absent
-    name: TestPoolBB7
-    region: us-east-1
-    api_url: cds-aws-bundles.netapp.com
-    api_key: MyAPiKey
-    secret_key: MySecretKey
-
-- name: Update a Pool
-  aws_netapp_cvs_pool:
-    state: present
-    from_name: TestPoolBB12
-    name: Mynewpool7
-    vendorID: ansibleVendorMynewpool15
-    serviceLevel: extreme
-    sizeInBytes: 4000000000000
-    region: us-east-1
-    api_url: cds-aws-bundles.netapp.com
-    api_key: MyAPiKey
-    secret_key: MySecretKey
-
-"""
-
-RETURN = '''
-'''
-
-import ansible.module_utils.netapp as netapp_utils
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.netapp_module import NetAppModule
-from ansible.module_utils.netapp import AwsCvsRestAPI
-
-
-class NetAppAWSCVS(object):
-    '''Class  for  Pool operations '''
-
-    def __init__(self):
-        """
-        Parse arguments, setup state variables,
-        """
-        self.argument_spec = netapp_utils.aws_cvs_host_argument_spec()
-        self.argument_spec.update(dict(
-            state=dict(required=True, choices=['present', 'absent']),
-            region=dict(required=True, type='str'),
-            name=dict(required=True, type='str'),
-            from_name=dict(required=False, type='str'),
-            serviceLevel=dict(required=False, choices=['basic', 'standard', 'extreme'], type='str'),
-            sizeInBytes=dict(required=False, type='int'),
-            vendorID=dict(required=False, type='str'),
-        ))
-        self.module = AnsibleModule(
-            argument_spec=self.argument_spec,
-            supports_check_mode=True
-        )
-
-        self.na_helper = NetAppModule()
-        self.parameters = self.na_helper.set_parameters(self.module.params)
-        self.restApi = AwsCvsRestAPI(self.module)
-        self.sizeInBytes_min_value = 4000000000000
-
-    def get_aws_netapp_cvs_pool(self, name=None):
-        """
-        Returns Pool object if exists else Return None
-        """
-        pool_info = None
-
-        if name is None:
-            name = self.parameters['name']
-
-        pools, error = self.restApi.get('Pools')
-
-        if error is None and pools is not None:
-            for pool in pools:
-                if 'name' in pool and pool['region'] == self.parameters['region']:
-                    if pool['name'] == name:
-                        pool_info = pool
-                        break
-
-        return pool_info
-
-    def create_aws_netapp_cvs_pool(self):
-        """
-        Create a pool
-        """
-        api = 'Pools'
-
-        for key in ['serviceLevel', 'sizeInBytes', 'vendorID']:
-            if key not in self.parameters.keys() or self.parameters[key] is None:
-                self.module.fail_json(changed=False, msg="Mandatory key '%s' required" % (key))
-
-        pool = {
-            "name": self.parameters['name'],
-            "region": self.parameters['region'],
-            "serviceLevel": self.parameters['serviceLevel'],
-            "sizeInBytes": self.parameters['sizeInBytes'],
-            "vendorID": self.parameters['vendorID']
-        }
-
-        response, error = self.restApi.post(api, pool)
-        if error is not None:
-            self.module.fail_json(changed=False, msg=error)
-
-    def update_aws_netapp_cvs_pool(self, update_pool_info, pool_id):
-        """
-        Update a pool
-        """
-        api = 'Pools/' + pool_id
-
-        pool = {
-            "name": update_pool_info['name'],
-            "region": self.parameters['region'],
-            "serviceLevel": update_pool_info['serviceLevel'],
-            "sizeInBytes": update_pool_info['sizeInBytes'],
-            "vendorID": update_pool_info['vendorID']
-        }
-
-        response, error = self.restApi.put(api, pool)
-        if error is not None:
-            self.module.fail_json(changed=False, msg=error)
-
-    def delete_aws_netapp_cvs_pool(self, pool_id):
-        """
-        Delete a pool
-        """
-        api = 'Pools/' + pool_id
-        data = None
-        response, error = self.restApi.delete(api, data)
-
-        if error is not None:
-            self.module.fail_json(changed=False, msg=error)
-
-    def apply(self):
-        """
-        Perform pre-checks, call functions and exit
-        """
-        update_required = False
-        cd_action = None
-
-        if 'sizeInBytes' in self.parameters.keys() and self.parameters['sizeInBytes'] < self.sizeInBytes_min_value:
-            self.module.fail_json(changed=False, msg="sizeInBytes should be greater than  or equal to %d" % (self.sizeInBytes_min_value))
-
-        current = self.get_aws_netapp_cvs_pool()
-        if self.parameters.get('from_name'):
-            existing = self.get_aws_netapp_cvs_pool(self.parameters['from_name'])
-            rename = self.na_helper.is_rename_action(existing, current)
-            if rename is None:
-                self.module.fail_json(changed=False, msg="unable to rename pool: '%s' does not exist" % self.parameters['from_name'])
-            if rename:
-                current = existing
-        else:
-            cd_action = self.na_helper.get_cd_action(current, self.parameters)
-
-        if cd_action is None and self.parameters['state'] == 'present':
-            keys_to_check = ['name', 'vendorID', 'sizeInBytes', 'serviceLevel']
-            update_pool_info, update_required = self.na_helper.compare_and_update_values(current, self.parameters, keys_to_check)
-
-            if update_required is True:
-                self.na_helper.changed = True
-                cd_action = 'update'
-
-        if self.na_helper.changed:
-            if self.module.check_mode:
-                pass
-            else:
-                if cd_action == 'update':
-                    self.update_aws_netapp_cvs_pool(update_pool_info, current['poolId'])
-                elif cd_action == 'create':
-                    self.create_aws_netapp_cvs_pool()
-                elif cd_action == 'delete':
-                    self.delete_aws_netapp_cvs_pool(current['poolId'])
-
-        self.module.exit_json(changed=self.na_helper.changed)
-
-
-def main():
-    '''Main Function'''
-    aws_cvs_netapp_pool = NetAppAWSCVS()
-    aws_cvs_netapp_pool.apply()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_snapshots.py b/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_snapshots.py
deleted file mode 100644
index f5b39ef252..0000000000
--- a/lib/ansible/modules/cloud/amazon/aws_netapp_cvs_snapshots.py
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/usr/bin/python
-
-# (c) 2019, NetApp Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""AWS Cloud Volumes Services - Manage Snapshots"""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-
-ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
-                    'supported_by': 'community'}
-
-
-DOCUMENTATION = '''
-
-module: aws_netapp_cvs_snapshots
-
-short_description: NetApp AWS Cloud Volumes Service Manage Snapshots.
-extends_documentation_fragment:
-    - netapp.awscvs
-version_added: '2.9'
-author: NetApp Ansible Team (@carchi8py) <ng-ansibleteam@netapp.com>
-description:
-- Create, Update, Delete Snapshot on AWS Cloud Volumes Service.
-
-options:
-  state:
-     description:
-     - Whether the specified snapshot should exist or not.
-     required: true
-     type: str
-     choices: ['present', 'absent']
-
-  region:
-    description:
-    - The region to which the snapshot belongs to.
-    required: true
-    type: str
-
-  name:
-    description:
-    - Name of the snapshot
-    required: true
-    type: str
-
-  fileSystemId:
-    description:
-    - Name or Id of the filesystem.
-    - Required for create operation
-    type: str
-
-  from_name:
-    description:
-    - ID or Name of the snapshot to rename.
-    - Required to create an snapshot called 'name' by renaming 'from_name'.
-    type: str
-'''
-
-EXAMPLES = """
-- name: Create Snapshot
-  aws_netapp_cvs_snapshots:
-    state: present
-    region: us-east-1
-    name: testSnapshot
-    fileSystemId: testVolume
-    api_url : cds-aws-bundles.netapp.com
-    api_key: myApiKey
-    secret_key : mySecretKey
-
-- name: Update Snapshot
-  aws_netapp_cvs_snapshots:
-    state: present
-    region: us-east-1
-    name: testSnapshot - renamed
-    from_name: testSnapshot
-    fileSystemId: testVolume
-    api_url : cds-aws-bundles.netapp.com
-    api_key: myApiKey
-    secret_key : mySecretKey
-
-- name: Delete Snapshot
-  aws_netapp_cvs_snapshots:
-    state: absent
-    region: us-east-1
-    name: testSnapshot
-    api_url : cds-aws-bundles.netapp.com
-    api_key: myApiKey
-    secret_key : mySecretKey
-"""
-
-RETURN = """
-"""
-
-import ansible.module_utils.netapp as netapp_utils
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.netapp_module import NetAppModule
-from ansible.module_utils.netapp import AwsCvsRestAPI
-
-
-class AwsCvsNetappSnapshot(object):
-    """
-    Contains methods to parse arguments,
-    derive details of AWS_CVS objects
-    and send requests to AWS CVS via
-    the restApi
-    """
-
-    def __init__(self):
-        """
-        Parse arguments, setup state variables,
-        check parameters and ensure request module is installed
-        """
-        self.argument_spec = netapp_utils.aws_cvs_host_argument_spec()
-        self.argument_spec.update(dict(
-            state=dict(required=True, choices=['present', 'absent']),
-            region=dict(required=True, type='str'),
-            name=dict(required=True, type='str'),
-            from_name=dict(required=False, type='str'),
-            fileSystemId=dict(required=False, type='str')
-        ))
-
-        self.module = AnsibleModule(
-            argument_spec=self.argument_spec,
-            required_if=[
-                ('state', 'present', ['name', 'fileSystemId']),
-            ],
-            supports_check_mode=True
-        )
-
-        self.na_helper = NetAppModule()
-
-        # set up state variables
-        self.parameters = self.na_helper.set_parameters(self.module.params)
-        # Calling generic AWSCVS restApi class
-        self.restApi = AwsCvsRestAPI(self.module)
-
-        # Checking for the parameters passed and create new parameters list
-        self.data = {}
-        for key in self.parameters.keys():
-            self.data[key] = self.parameters[key]
-
-    def getSnapshotId(self, name):
-        # Check if  snapshot exists
-        # Return snapshot Id  If Snapshot is found, None otherwise
-        list_snapshots, error = self.restApi.get('Snapshots')
-
-        if error:
-            self.module.fail_json(msg=error)
-
-        for snapshot in list_snapshots:
-            if snapshot['name'] == name:
-                return snapshot['snapshotId']
-        return None
-
-    def getfilesystemId(self):
-        # Check given FileSystem is exists
-        # Return fileSystemId is found, None otherwise
-        list_filesystem, error = self.restApi.get('FileSystems')
-
-        if error:
-            self.module.fail_json(msg=error)
-        for FileSystem in list_filesystem:
-            if FileSystem['fileSystemId'] == self.parameters['fileSystemId']:
-                return FileSystem['fileSystemId']
-            elif FileSystem['creationToken'] == self.parameters['fileSystemId']:
-                return FileSystem['fileSystemId']
-        return None
-
-    def create_snapshot(self):
-        # Create Snapshot
-        api = 'Snapshots'
-        response, error = self.restApi.post(api, self.data)
-        if error:
-            self.module.fail_json(msg=error)
-
-    def rename_snapshot(self, snapshotId):
-        # Rename Snapshot
-        api = 'Snapshots/' + snapshotId
-        response, error = self.restApi.put(api, self.data)
-        if error:
-            self.module.fail_json(msg=error)
-
-    def delete_snapshot(self, snapshotId):
-        # Delete Snapshot
-        api = 'Snapshots/' + snapshotId
-        data = None
-        response, error = self.restApi.delete(api, self.data)
-        if error:
-            self.module.fail_json(msg=error)
-
-    def apply(self):
-        """
-        Perform pre-checks, call functions and exit
-        """
-        self.snapshotId = self.getSnapshotId(self.data['name'])
-
-        if self.snapshotId is None and 'fileSystemId' in self.data:
-            self.fileSystemId = self.getfilesystemId()
-            self.data['fileSystemId'] = self.fileSystemId
-            if self.fileSystemId is None:
-                self.module.fail_json(msg='Error: Specified filesystem id %s does not exist ' % self.data['fileSystemId'])
-
-        cd_action = self.na_helper.get_cd_action(self.snapshotId, self.data)
-        result_message = ""
-        if self.na_helper.changed:
-            if self.module.check_mode:
-                # Skip changes
-                result_message = "Check mode, skipping changes"
-            else:
-                if cd_action == "delete":
-                    self.delete_snapshot(self.snapshotId)
-                    result_message = "Snapshot Deleted"
-
-                elif cd_action == "create":
-                    if 'from_name' in self.data:
-                        # If cd_action is create and from_name is given
-                        snapshotId = self.getSnapshotId(self.data['from_name'])
-                        if snapshotId is not None:
-                            # If resource pointed by from_name exists, rename the snapshot to name
-                            self.rename_snapshot(snapshotId)
-                            result_message = "Snapshot Updated"
-                        else:
-                            # If resource pointed by from_name does not exists, error out
-                            self.module.fail_json(msg="Resource does not exist : %s" % self.data['from_name'])
-                    else:
-                        self.create_snapshot()
-                        # If from_name is not defined, Create from scratch.
-                        result_message = "Snapshot Created"
-
-        self.module.exit_json(changed=self.na_helper.changed, msg=result_message)
-
-
-def main():
-    """
-    Main function
-    """
-    aws_netapp_cvs_snapshots = AwsCvsNetappSnapshot()
-    aws_netapp_cvs_snapshots.apply()
-
-
-if __name__ == '__main__':
-    main()
diff --git a/test/sanity/ignore.txt b/test/sanity/ignore.txt
index cfc2d4bf92..01975df01a 100644
--- a/test/sanity/ignore.txt
+++ b/test/sanity/ignore.txt
@@ -202,7 +202,6 @@ lib/ansible/module_utils/urls.py pylint:blacklisted-name
 lib/ansible/module_utils/urls.py replace-urlopen
 lib/ansible/module_utils/yumdnf.py future-import-boilerplate
 lib/ansible/module_utils/yumdnf.py metaclass-boilerplate
-lib/ansible/modules/cloud/amazon/aws_netapp_cvs_FileSystems.py validate-modules:parameter-list-no-elements
 lib/ansible/modules/cloud/azure/azure_rm_acs.py validate-modules:parameter-list-no-elements
 lib/ansible/modules/cloud/azure/azure_rm_acs.py validate-modules:parameter-type-not-in-doc
 lib/ansible/modules/cloud/azure/azure_rm_acs.py validate-modules:required_if-requirements-unknown
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/a.pem b/test/units/modules/cloud/amazon/fixtures/certs/a.pem
deleted file mode 100644
index 4412f3258a..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/a.pem
+++ /dev/null
@@ -1,31 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFVTCCBD2gAwIBAgISAx4pnfwvGxYrrQhr/UXiN7HCMA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTA3MjUwMDI4NTdaFw0x
-OTEwMjMwMDI4NTdaMBoxGDAWBgNVBAMTD2NyeXB0b2dyYXBoeS5pbzCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJDpCL99DVo83587MrVp6gunmKRoUfY
-vcgk5u2v0tB9OmZkcIY37z6AunHWr18Yj55zHmm6G8Nf35hmu3ql2A26WThCbmOe
-WXbxhgarkningZI9opUWnI2dIllguVIsq99GzhpNnDdCb26s5+SRhJI4cr4hYaKC
-XGDKooKWyXUX09SJTq7nW/1+pq3y9ZMvldRKjJALeAdwnC7kmUB6pK7q8J2VlpfQ
-wqGu6q/WHVdgnhWARw3GEFJWDn9wkxBAF08CpzhVaEj+iK+Ut/1HBgNYwqI47h7S
-q+qv0G2qklRVUtEM0zYRsp+y/6vivdbFLlPw8VaerbpJN3gLtpVNcGECAwEAAaOC
-AmMwggJfMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
-BQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUjbe0bE1aZ8HiqtwqUfCe15bF
-V8UwHwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEE
-YzBhMC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQu
-b3JnMC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQu
-b3JnLzAaBgNVHREEEzARgg9jcnlwdG9ncmFwaHkuaW8wTAYDVR0gBEUwQzAIBgZn
-gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s
-ZXRzZW5jcnlwdC5vcmcwggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdgB0ftqDMa0z
-EJEhnM4lT0Jwwr/9XkIgCMY3NXnmEHvMVgAAAWwmvtnXAAAEAwBHMEUCIFXHYX/E
-xtbYCvjjQ3dN0HOLW1d8+aduktmax4mu3KszAiEAvTpxuSVVXJnVGA4tU2GOnI60
-sqTh/IK6hvrFN1k1HBUAdQApPFGWVMg5ZbqqUPxYB9S3b79Yeily3KTDDPTlRUf0
-eAAAAWwmvtm9AAAEAwBGMEQCIDn7sgzD+7JzR+XTvjKf7VyLWwX37O8uwCfCTKo7
-+tEhAiB05bHiICU5wkfRBrwcvqXf4bPF7NT5LVlRQYzJ/hbpvzANBgkqhkiG9w0B
-AQsFAAOCAQEAcMU8E6D+5WC07QSeTppRTboC++7YgQg5NiSWm7OE2FlyiRZXnu0Y
-uBoaqAkZIqj7dom9wy1c1UauxOfM9lUZKhYnDTBu9tIhBAvCS0J0avv1j1KQygQ1
-qV+urJsunUwqV/vPWo1GfWophvyXVN6MAycv34ZXZvAjtG7oDcoQVLLvK1SIo2vu
-4/dNkOQzaeZez8q6Ij9762TbBWaK5C789VMdUWZCADWoToPIK533cWbDEp4IhBU/
-K73d7lGGl7S59SjT2V/XE6eJS9Zlj0M+A8pf/8tjM/ImHAjlOHB02sM/VfZ7HAuZ
-61TPxohL+e+X1FYeqIXYGXJmCEuB8WEmBg==
------END CERTIFICATE-----
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/b.pem b/test/units/modules/cloud/amazon/fixtures/certs/b.pem
deleted file mode 100644
index 2be4bca533..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/b.pem
+++ /dev/null
@@ -1,47 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIIUjCCB/egAwIBAgIRALiJR3zQjp0MevT/Hk89sfAwCgYIKoZIzj0EAwIwgZIx
-CzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAOBgNV
-BAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTgwNgYDVQQD
-Ey9DT01PRE8gRUNDIERvbWFpbiBWYWxpZGF0aW9uIFNlY3VyZSBTZXJ2ZXIgQ0Eg
-MjAeFw0xOTA3MzEwMDAwMDBaFw0yMDAyMDYyMzU5NTlaMGwxITAfBgNVBAsTGERv
-bWFpbiBDb250cm9sIFZhbGlkYXRlZDEhMB8GA1UECxMYUG9zaXRpdmVTU0wgTXVs
-dGktRG9tYWluMSQwIgYDVQQDExtzc2wzODczMzcuY2xvdWRmbGFyZXNzbC5jb20w
-WTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARPFdjdnBIJRPnHCPsCBJ/MmPytXnZX
-KV6lD2bbG5EVNuUQln4Na8heCY+sfpV+SPuuiNzZxgDA46GvyzdRYFhxo4IGUTCC
-Bk0wHwYDVR0jBBgwFoAUQAlhZ/C8g3FP3hIILG/U1Ct2PZYwHQYDVR0OBBYEFGLh
-bHk1KAYIRfVwXA3L+yDf0CxjMA4GA1UdDwEB/wQEAwIHgDAMBgNVHRMBAf8EAjAA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoGCysG
-AQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5j
-b20vQ1BTMAgGBmeBDAECATBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLmNv
-bW9kb2NhNC5jb20vQ09NT0RPRUNDRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZl
-ckNBMi5jcmwwgYgGCCsGAQUFBwEBBHwwejBRBggrBgEFBQcwAoZFaHR0cDovL2Ny
-dC5jb21vZG9jYTQuY29tL0NPTU9ET0VDQ0RvbWFpblZhbGlkYXRpb25TZWN1cmVT
-ZXJ2ZXJDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC5jb21vZG9jYTQu
-Y29tMIIDkAYDVR0RBIIDhzCCA4OCG3NzbDM4NzMzNy5jbG91ZGZsYXJlc3NsLmNv
-bYIMKi5hanJ0Y3QuY29tghMqLmFrcmVwYnVyY3UuZ2VuLnRyghUqLmFuZHJlYXNr
-YW5lbGxvcy5jb22CDSouYW5zaWJsZS5jb22CGSouYXJ0b2Z0b3VjaC1raW5nd29v
-ZC5jb22CFyouYm91bGRlcnN3YXRlcmhvbGUuY29tghcqLmJyb2Nrc3RlY2hzdXBw
-b3J0LmNvbYIQKi5idXJjbGFyLndlYi50coIcKi5ob3Blc29uZ2ZyZW5jaGJ1bGxk
-b2dzLm5ldIIMKi5odXJyZW0uY29tghAqLmh5dmVsaWNvbnMuY29tghAqLmthcm1h
-Zml0LmNvLnVrghUqLmxvd3J5c3lzdGVtc2luYy5jb22CDioubWFuaWNydW4uY29t
-ghUqLm11dHVvZmluYW5jaWVyYS5jb22CDyoucGlsZ3JpbWFnZS5waIINKi5wa2dh
-bWVzLm9yZ4IbKi5ybHBjb25zdWx0aW5nc2VydmljZXMuY29tghYqLnJ1eWF0YWJp
-cmxlcmkuZ2VuLnRyghQqLnJ5YW5hcHBoeXNpY3NjLmNvbYIVKi53ZWFyaXRiYWNr
-d2FyZHMub3Jngg8qLnlldGlzbmFjay5jb22CCmFqcnRjdC5jb22CEWFrcmVwYnVy
-Y3UuZ2VuLnRyghNhbmRyZWFza2FuZWxsb3MuY29tggthbnNpYmxlLmNvbYIXYXJ0
-b2Z0b3VjaC1raW5nd29vZC5jb22CFWJvdWxkZXJzd2F0ZXJob2xlLmNvbYIVYnJv
-Y2tzdGVjaHN1cHBvcnQuY29tgg5idXJjbGFyLndlYi50coIaaG9wZXNvbmdmcmVu
-Y2hidWxsZG9ncy5uZXSCCmh1cnJlbS5jb22CDmh5dmVsaWNvbnMuY29tgg5rYXJt
-YWZpdC5jby51a4ITbG93cnlzeXN0ZW1zaW5jLmNvbYIMbWFuaWNydW4uY29tghNt
-dXR1b2ZpbmFuY2llcmEuY29tgg1waWxncmltYWdlLnBoggtwa2dhbWVzLm9yZ4IZ
-cmxwY29uc3VsdGluZ3NlcnZpY2VzLmNvbYIUcnV5YXRhYmlybGVyaS5nZW4udHKC
-EnJ5YW5hcHBoeXNpY3NjLmNvbYITd2Vhcml0YmFja3dhcmRzLm9yZ4INeWV0aXNu
-YWNrLmNvbTCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ALIeBcyLos2KIE6HZvkr
-uYolIGdr2vpw57JJUy3vi5BeAAABbEVw8SgAAAQDAEcwRQIgE2YeTfb/d4BBUwpZ
-ihWXSR+vRyNNUg8GlOak2MFMHv0CIQCLBvtU401m5/Psg9KirQZs321BSxgUKgSQ
-m9M691d3eQB2AF6nc/nfVsDntTZIfdBJ4DJ6kZoMhKESEoQYdZaBcUVYAAABbEVw
-8VgAAAQDAEcwRQIgGYsGfr3/mekjzMS9+ALAjx1ryfIfhXB/+UghTcw4Y8ICIQDS
-K2L18WX3+Oh4TjJhjh5tV1iYyZVYivcwwbr7mtmOqjAKBggqhkjOPQQDAgNJADBG
-AiEAjNt7LF78GV7snky9jwFcBsLH55ndzduvsrkJ7Ne1SgYCIQDsMJsTr9VP6kar
-4Kv8V9zNBmpGrGNuE7A1GixBvzNaHA==
------END CERTIFICATE-----
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.0.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-1.0.cert
deleted file mode 100644
index 6997766acd..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.0.cert
+++ /dev/null
@@ -1,121 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-MIIIHTCCBgWgAwIBAgIUCqrrzSfjzaoyB3DOxst2kMxFp/MwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyMTIyMjIy
-OFoXDTIxMDgyMTIyMzIwMFowgZsxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBv
-cmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MSYwJAYDVQQD
-DB1kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPAPH2y206qios2NMzlCNJv1mrwC1/8tH2HOqJGiYZB
-O7QOBRSvJsV++IozCB8ap99e8B64OOAQPOyykrdXd2axhftmMb1SFMF56eukHSuz
-KhKWRUgHs0UFRU51lDcBcOvphwJ+5SOgqrqKFFFBgJ0ZpcP54JpFwKIdh3ac10x2
-mBaW5ccqdv5X9oEMu1D/yivBmy34tsbLYyfttCjP76iVT7UVYHjHWynnIhsEyMsU
-gdM90NzrTlrvTSi/EcCD1W3+8b0f+G1TI5rhHbKwR0n/mv5QLFm7EABoYPhxS8bX
-B+9tE67yb0RyWbgvUiHySRynQLNMRpRx8Y9bA8uC8n8CAwEAAaOCA6QwggOgMAkG
-A1UdEwQCMAAwHwYDVR0jBBgwFoAUsxKJtalLNbwVAPCA6dh4h/ETfHYwcwYIKwYB
-BQUHAQEEZzBlMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsZzMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92
-YWRpc2dsb2JhbC5jb20wgZ8GA1UdEQSBlzCBlIIdZGV2LmVuZXJneS5pbnNpZGUu
-dGVsc3RyYS5jb22CJXJlcG9ydHMuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5j
-b22CJ2dyZWVuc3luYy5kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbYIjbmdv
-c3MuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wUQYDVR0gBEowSDBGBgwr
-BgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
-b2JhbC5jb20vcmVwb3NpdG9yeTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5j
-b20vcXZzc2xnMy5jcmwwHQYDVR0OBBYEFEoJQRpPC/V5ZK3mMkszZE2v6vh+MA4G
-A1UdDwEB/wQEAwIFoDCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUAVhQGmi/X
-wuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFstk9Y+gAABAMARjBEAiBFMZa6
-O9iXVjy2kqQa54vgNFdU7shgFJJhm//fSAQZUAIgBIL/yPdh+XiuQS2xPhCzNYkh
-bxf7BbN4qUISESgiZpsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ
-EwAAAWy2T1nKAAAEAwBHMEUCIG0tp63jLsDsfCTDlcvV5ItjRkbUJBnkxlPdP2PH
-88sTAiEApgaPofVdn2hdI12iDDex72ta+9wpwQ1MxoaJn2nt+qEAdQDuS723dc5g
-uuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWy2T1iJAAAEAwBGMEQCIE/mzEFp
-CJUc71jvwJa4Px86R3ZYK4mHmUlQAUZqd0ZkAiBdEmT8xxTuleSUlYHEkKCK/FZX
-L+vsYJpPrA9TsO5IsTANBgkqhkiG9w0BAQsFAAOCAgEApE9WLz3S8tqA9Dk3r9LF
-rJy8km9cBt1O9SQZwFsduGKGdF3Fd+/Y0V7UrFDzrX+NIzqcmgBHKxaIXorMBF70
-ajMaaROP2ymkpEXnruEwoR47fbW+JRAWDRm2xnouQveQX9ZcgCLbBvAWBqpndQj2
-DGmLJhNz5GlFBjh3PQZlU1w8hU7TrDxa7M1GMtVnk8X+o3l/MX9iPeEs+PiC4dHD
-hpj84RY1VQJz8+10rql47SB5YgbwcqaizTG4ax/OAv1JHNWtfAodIMX8Y8X00zoz
-A20LQv880jCCNANVNbrXJ3h4X3xwW/C1X9vYk0shymZJbT5u17JbPD1cy39bA7kT
-F4L7scdQRxvcqazYN4/IdgvgMji9OltiYufP88Ti8KB2tcl2accpiC5St/zllGD1
-hqEeYLMzjyvUKR/1uvURQQtc0DPvBRmvkB+aI4g+sLkTTFWj5bsA1vKU8SDCyMuB
-RQV11DId5+RNNCmWnskORUZJQssvY49pnfCxCES2nt3l/XzTzVtLYmd6G9uAqVac
-e2ibnmDrFVlmlyRsCiMfZl5/OTJzt7Cj3az59m5Syfw/lnS9YP82t/r/ufuKkO5Q
-q5a9aI8DuNNmAjR4lpIJNqIpX/y+dG2aGmx4XTc31MR9szWtiTgOHe0MkMupOAL0
-qkHrBgwo1zjuTMf3QOg6Z5Q=
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0y
-MjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vK
-EymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPan
-H05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jz
-kE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5B
-xxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uD
-JGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNV
-HSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1Ud
-IwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4E
-FgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/A
-Vn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTs
-Y4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48
-gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/
-TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMb
-SXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.1.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-1.1.cert
deleted file mode 100644
index 51f64f08d1..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.1.cert
+++ /dev/null
@@ -1,69 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-MIIIHTCCBgWgAwIBAgIUCqrrzSfjzaoyB3DOxst2kMxFp/MwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyMTIyMjIyOFoXDTIxMDgyMTIyMzIwMFowgZsxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBvcmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MSYwJAYDVQQD
-DB1kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPAPH2y206qios2NMzlCNJv1mrwC1/8tH2HOqJGiYZB
-O7QOBRSvJsV++IozCB8ap99e8B64OOAQPOyykrdXd2axhftmMb1SFMF56eukHSuzKhKWRUgHs0UFRU51lDcBcOvphwJ+5SOgqrqKFFFBgJ0ZpcP54JpFwKIdh3ac10x2
-mBaW5ccqdv5X9oEMu1D/yivBmy34tsbLYyfttCjP76iVT7UVYHjHWynnIhsEyMsUgdM90NzrTlrvTSi/EcCD1W3+8b0f+G1TI5rhHbKwR0n/mv5QLFm7EABoYPhxS8bX
-B+9tE67yb0RyWbgvUiHySRynQLNMRpRx8Y9bA8uC8n8CAwEAAaOCA6QwggOgMAkGA1UdEwQCMAAwHwYDVR0jBBgwFoAUsxKJtalLNbwVAPCA6dh4h/ETfHYwcwYIKwYB
-BQUHAQEEZzBlMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2c3NsZzMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92
-YWRpc2dsb2JhbC5jb20wgZ8GA1UdEQSBlzCBlIIdZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb22CJXJlcG9ydHMuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5j
-b22CJ2dyZWVuc3luYy5kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbYIjbmdvc3MuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wUQYDVR0gBEowSDBGBgwr
-BgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2dsb2JhbC5jb20vcmVwb3NpdG9yeTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5jb20vcXZzc2xnMy5jcmwwHQYDVR0OBBYEFEoJQRpPC/V5ZK3mMkszZE2v6vh+MA4G
-A1UdDwEB/wQEAwIFoDCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUAVhQGmi/XwuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFstk9Y+gAABAMARjBEAiBFMZa6
-O9iXVjy2kqQa54vgNFdU7shgFJJhm//fSAQZUAIgBIL/yPdh+XiuQS2xPhCzNYkhbxf7BbN4qUISESgiZpsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ
-EwAAAWy2T1nKAAAEAwBHMEUCIG0tp63jLsDsfCTDlcvV5ItjRkbUJBnkxlPdP2PH88sTAiEApgaPofVdn2hdI12iDDex72ta+9wpwQ1MxoaJn2nt+qEAdQDuS723dc5g
-uuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWy2T1iJAAAEAwBGMEQCIE/mzEFpCJUc71jvwJa4Px86R3ZYK4mHmUlQAUZqd0ZkAiBdEmT8xxTuleSUlYHEkKCK/FZX
-L+vsYJpPrA9TsO5IsTANBgkqhkiG9w0BAQsFAAOCAgEApE9WLz3S8tqA9Dk3r9LFrJy8km9cBt1O9SQZwFsduGKGdF3Fd+/Y0V7UrFDzrX+NIzqcmgBHKxaIXorMBF70
-ajMaaROP2ymkpEXnruEwoR47fbW+JRAWDRm2xnouQveQX9ZcgCLbBvAWBqpndQj2DGmLJhNz5GlFBjh3PQZlU1w8hU7TrDxa7M1GMtVnk8X+o3l/MX9iPeEs+PiC4dHD
-hpj84RY1VQJz8+10rql47SB5YgbwcqaizTG4ax/OAv1JHNWtfAodIMX8Y8X00zozA20LQv880jCCNANVNbrXJ3h4X3xwW/C1X9vYk0shymZJbT5u17JbPD1cy39bA7kT
-F4L7scdQRxvcqazYN4/IdgvgMji9OltiYufP88Ti8KB2tcl2accpiC5St/zllGD1hqEeYLMzjyvUKR/1uvURQQtc0DPvBRmvkB+aI4g+sLkTTFWj5bsA1vKU8SDCyMuB
-RQV11DId5+RNNCmWnskORUZJQssvY49pnfCxCES2nt3l/XzTzVtLYmd6G9uAqVace2ibnmDrFVlmlyRsCiMfZl5/OTJzt7Cj3az59m5Syfw/lnS9YP82t/r/ufuKkO5Q
-q5a9aI8DuNNmAjR4lpIJNqIpX/y+dG2aGmx4XTc31MR9szWtiTgOHe0MkMupOAL0qkHrBgwo1zjuTMf3QOg6Z5Q=
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQELBQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0yMjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vKEymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPanH05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jzkE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5BxxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uDJGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNVHSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1UdIwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4EFgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/AVn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTsY4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMbSXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.2.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-1.2.cert
deleted file mode 100644
index ce29924118..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.2.cert
+++ /dev/null
@@ -1,113 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIIHTCCBgWgAwIBAgIUCqrrzSfjzaoyB3DOxst2kMxFp/MwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyMTIyMjIy
-OFoXDTIxMDgyMTIyMzIwMFowgZsxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBv
-cmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MSYwJAYDVQQD
-DB1kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPAPH2y206qios2NMzlCNJv1mrwC1/8tH2HOqJGiYZB
-O7QOBRSvJsV++IozCB8ap99e8B64OOAQPOyykrdXd2axhftmMb1SFMF56eukHSuz
-KhKWRUgHs0UFRU51lDcBcOvphwJ+5SOgqrqKFFFBgJ0ZpcP54JpFwKIdh3ac10x2
-mBaW5ccqdv5X9oEMu1D/yivBmy34tsbLYyfttCjP76iVT7UVYHjHWynnIhsEyMsU
-gdM90NzrTlrvTSi/EcCD1W3+8b0f+G1TI5rhHbKwR0n/mv5QLFm7EABoYPhxS8bX
-B+9tE67yb0RyWbgvUiHySRynQLNMRpRx8Y9bA8uC8n8CAwEAAaOCA6QwggOgMAkG
-A1UdEwQCMAAwHwYDVR0jBBgwFoAUsxKJtalLNbwVAPCA6dh4h/ETfHYwcwYIKwYB
-BQUHAQEEZzBlMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsZzMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92
-YWRpc2dsb2JhbC5jb20wgZ8GA1UdEQSBlzCBlIIdZGV2LmVuZXJneS5pbnNpZGUu
-dGVsc3RyYS5jb22CJXJlcG9ydHMuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5j
-b22CJ2dyZWVuc3luYy5kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbYIjbmdv
-c3MuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wUQYDVR0gBEowSDBGBgwr
-BgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
-b2JhbC5jb20vcmVwb3NpdG9yeTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5j
-b20vcXZzc2xnMy5jcmwwHQYDVR0OBBYEFEoJQRpPC/V5ZK3mMkszZE2v6vh+MA4G
-A1UdDwEB/wQEAwIFoDCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUAVhQGmi/X
-wuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFstk9Y+gAABAMARjBEAiBFMZa6
-O9iXVjy2kqQa54vgNFdU7shgFJJhm//fSAQZUAIgBIL/yPdh+XiuQS2xPhCzNYkh
-bxf7BbN4qUISESgiZpsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ
-EwAAAWy2T1nKAAAEAwBHMEUCIG0tp63jLsDsfCTDlcvV5ItjRkbUJBnkxlPdP2PH
-88sTAiEApgaPofVdn2hdI12iDDex72ta+9wpwQ1MxoaJn2nt+qEAdQDuS723dc5g
-uuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWy2T1iJAAAEAwBGMEQCIE/mzEFp
-CJUc71jvwJa4Px86R3ZYK4mHmUlQAUZqd0ZkAiBdEmT8xxTuleSUlYHEkKCK/FZX
-L+vsYJpPrA9TsO5IsTANBgkqhkiG9w0BAQsFAAOCAgEApE9WLz3S8tqA9Dk3r9LF
-rJy8km9cBt1O9SQZwFsduGKGdF3Fd+/Y0V7UrFDzrX+NIzqcmgBHKxaIXorMBF70
-ajMaaROP2ymkpEXnruEwoR47fbW+JRAWDRm2xnouQveQX9ZcgCLbBvAWBqpndQj2
-DGmLJhNz5GlFBjh3PQZlU1w8hU7TrDxa7M1GMtVnk8X+o3l/MX9iPeEs+PiC4dHD
-hpj84RY1VQJz8+10rql47SB5YgbwcqaizTG4ax/OAv1JHNWtfAodIMX8Y8X00zoz
-A20LQv880jCCNANVNbrXJ3h4X3xwW/C1X9vYk0shymZJbT5u17JbPD1cy39bA7kT
-F4L7scdQRxvcqazYN4/IdgvgMji9OltiYufP88Ti8KB2tcl2accpiC5St/zllGD1
-hqEeYLMzjyvUKR/1uvURQQtc0DPvBRmvkB+aI4g+sLkTTFWj5bsA1vKU8SDCyMuB
-RQV11DId5+RNNCmWnskORUZJQssvY49pnfCxCES2nt3l/XzTzVtLYmd6G9uAqVac
-e2ibnmDrFVlmlyRsCiMfZl5/OTJzt7Cj3az59m5Syfw/lnS9YP82t/r/ufuKkO5Q
-q5a9aI8DuNNmAjR4lpIJNqIpX/y+dG2aGmx4XTc31MR9szWtiTgOHe0MkMupOAL0
-qkHrBgwo1zjuTMf3QOg6Z5Q=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0y
-MjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vK
-EymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPan
-H05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jz
-kE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5B
-xxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uD
-JGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNV
-HSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1Ud
-IwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4E
-FgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/A
-Vn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTs
-Y4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48
-gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/
-TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMb
-SXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.3.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-1.3.cert
deleted file mode 100644
index 0c947b17ba..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.3.cert
+++ /dev/null
@@ -1,124 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-MIIIHTCCBgWgAwIBAgIUCqrrzSfjzaoyB3DOxst2kMxFp/MwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyMTIyMjIy
-OFoXDTIxMDgyMTIyMzIwMFowgZsxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBv
-cmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MSYwJAYDVQQD
-DB1kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPAPH2y206qios2NMzlCNJv1mrwC1/8tH2HOqJGiYZB
-O7QOBRSvJsV++IozCB8ap99e8B64OOAQPOyykrdXd2axhftmMb1SFMF56eukHSuz
-KhKWRUgHs0UFRU51lDcBcOvphwJ+5SOgqrqKFFFBgJ0ZpcP54JpFwKIdh3ac10x2
-mBaW5ccqdv5X9oEMu1D/yivBmy34tsbLYyfttCjP76iVT7UVYHjHWynnIhsEyMsU
-gdM90NzrTlrvTSi/EcCD1W3+8b0f+G1TI5rhHbKwR0n/mv5QLFm7EABoYPhxS8bX
-B+9tE67yb0RyWbgvUiHySRynQLNMRpRx8Y9bA8uC8n8CAwEAAaOCA6QwggOgMAkG
-A1UdEwQCMAAwHwYDVR0jBBgwFoAUsxKJtalLNbwVAPCA6dh4h/ETfHYwcwYIKwYB
-BQUHAQEEZzBlMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsZzMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92
-YWRpc2dsb2JhbC5jb20wgZ8GA1UdEQSBlzCBlIIdZGV2LmVuZXJneS5pbnNpZGUu
-dGVsc3RyYS5jb22CJXJlcG9ydHMuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5j
-b22CJ2dyZWVuc3luYy5kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbYIjbmdv
-c3MuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wUQYDVR0gBEowSDBGBgwr
-BgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
-b2JhbC5jb20vcmVwb3NpdG9yeTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5j
-b20vcXZzc2xnMy5jcmwwHQYDVR0OBBYEFEoJQRpPC/V5ZK3mMkszZE2v6vh+MA4G
-A1UdDwEB/wQEAwIFoDCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUAVhQGmi/X
-wuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFstk9Y+gAABAMARjBEAiBFMZa6
-O9iXVjy2kqQa54vgNFdU7shgFJJhm//fSAQZUAIgBIL/yPdh+XiuQS2xPhCzNYkh
-bxf7BbN4qUISESgiZpsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ
-EwAAAWy2T1nKAAAEAwBHMEUCIG0tp63jLsDsfCTDlcvV5ItjRkbUJBnkxlPdP2PH
-88sTAiEApgaPofVdn2hdI12iDDex72ta+9wpwQ1MxoaJn2nt+qEAdQDuS723dc5g
-uuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWy2T1iJAAAEAwBGMEQCIE/mzEFp
-CJUc71jvwJa4Px86R3ZYK4mHmUlQAUZqd0ZkAiBdEmT8xxTuleSUlYHEkKCK/FZX
-L+vsYJpPrA9TsO5IsTANBgkqhkiG9w0BAQsFAAOCAgEApE9WLz3S8tqA9Dk3r9LF
-rJy8km9cBt1O9SQZwFsduGKGdF3Fd+/Y0V7UrFDzrX+NIzqcmgBHKxaIXorMBF70
-ajMaaROP2ymkpEXnruEwoR47fbW+JRAWDRm2xnouQveQX9ZcgCLbBvAWBqpndQj2
-DGmLJhNz5GlFBjh3PQZlU1w8hU7TrDxa7M1GMtVnk8X+o3l/MX9iPeEs+PiC4dHD
-hpj84RY1VQJz8+10rql47SB5YgbwcqaizTG4ax/OAv1JHNWtfAodIMX8Y8X00zoz
-A20LQv880jCCNANVNbrXJ3h4X3xwW/C1X9vYk0shymZJbT5u17JbPD1cy39bA7kT
-F4L7scdQRxvcqazYN4/IdgvgMji9OltiYufP88Ti8KB2tcl2accpiC5St/zllGD1
-hqEeYLMzjyvUKR/1uvURQQtc0DPvBRmvkB+aI4g+sLkTTFWj5bsA1vKU8SDCyMuB
-RQV11DId5+RNNCmWnskORUZJQssvY49pnfCxCES2nt3l/XzTzVtLYmd6G9uAqVac
-e2ibnmDrFVlmlyRsCiMfZl5/OTJzt7Cj3az59m5Syfw/lnS9YP82t/r/ufuKkO5Q
-q5a9aI8DuNNmAjR4lpIJNqIpX/y+dG2aGmx4XTc31MR9szWtiTgOHe0MkMupOAL0
-qkHrBgwo1zjuTMf3QOg6Z5Q=
------END CERTIFICATE-----
-
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
-
-
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0y
-MjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vK
-EymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPan
-H05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jz
-kE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5B
-xxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uD
-JGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNV
-HSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1Ud
-IwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4E
-FgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/A
-Vn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTs
-Y4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48
-gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/
-TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMb
-SXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.4.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-1.4.cert
deleted file mode 100644
index adbb8edcae..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-1.4.cert
+++ /dev/null
@@ -1,86 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-MIIIHTCCBgWgAwIBAgIUCqrrzSfjzaoyB3DOxst2kMxFp/MwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyMTIyMjIy
-OFoXDTIxMDgyMTIyMzIwMFowgZsxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBv
-cmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MSYwJAYDVQQD
-DB1kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAMPAPH2y206qios2NMzlCNJv1mrwC1/8tH2HOqJGiYZB
-O7QOBRSvJsV++IozCB8ap99e8B64OOAQPOyykrdXd2axhftmMb1SFMF56eukHSuz
-KhKWRUgHs0UFRU51lDcBcOvphwJ+5SOgqrqKFFFBgJ0ZpcP54JpFwKIdh3ac10x2
-mBaW5ccqdv5X9oEMu1D/yivBmy34tsbLYyfttCjP76iVT7UVYHjHWynnIhsEyMsU
-gdM90NzrTlrvTSi/EcCD1W3+8b0f+G1TI5rhHbKwR0n/mv5QLFm7EABoYPhxS8bX
-B+9tE67yb0RyWbgvUiHySRynQLNMRpRx8Y9bA8uC8n8CAwEAAaOCA6QwggOgMAkG
-A1UdEwQCMAAwHwYDVR0jBBgwFoAUsxKJtalLNbwVAPCA6dh4h/ETfHYwcwYIKwYB
-BQUHAQEEZzBlMDcGCCsGAQUFBzAChitodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9i
-YWwuY29tL3F2c3NsZzMuY3J0MCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92
-YWRpc2dsb2JhbC5jb20wgZ8GA1UdEQSBlzCBlIIdZGV2LmVuZXJneS5pbnNpZGUu
-dGVsc3RyYS5jb22CJXJlcG9ydHMuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5j
-b22CJ2dyZWVuc3luYy5kZXYuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbYIjbmdv
-c3MuZGV2LmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wUQYDVR0gBEowSDBGBgwr
-BgEEAb5YAAJkAQEwNjA0BggrBgEFBQcCARYoaHR0cDovL3d3dy5xdW92YWRpc2ds
-b2JhbC5jb20vcmVwb3NpdG9yeTAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5xdW92YWRpc2dsb2JhbC5j
-b20vcXZzc2xnMy5jcmwwHQYDVR0OBBYEFEoJQRpPC/V5ZK3mMkszZE2v6vh+MA4G
-A1UdDwEB/wQEAwIFoDCCAXwGCisGAQQB1nkCBAIEggFsBIIBaAFmAHUAVhQGmi/X
-wuzT9eG9RLI+x0Z2ubyZEVzA75SYVdaJ0N0AAAFstk9Y+gAABAMARjBEAiBFMZa6
-O9iXVjy2kqQa54vgNFdU7shgFJJhm//fSAQZUAIgBIL/yPdh+XiuQS2xPhCzNYkh
-bxf7BbN4qUISESgiZpsAdgBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbIImjfZ
-EwAAAWy2T1nKAAAEAwBHMEUCIG0tp63jLsDsfCTDlcvV5ItjRkbUJBnkxlPdP2PH
-88sTAiEApgaPofVdn2hdI12iDDex72ta+9wpwQ1MxoaJn2nt+qEAdQDuS723dc5g
-uuFCaR+r4Z5mow9+X7By2IMAxHuJeqj9ywAAAWy2T1iJAAAEAwBGMEQCIE/mzEFp
-CJUc71jvwJa4Px86R3ZYK4mHmUlQAUZqd0ZkAiBdEmT8xxTuleSUlYHEkKCK/FZX
-L+vsYJpPrA9TsO5IsTANBgkqhkiG9w0BAQsFAAOCAgEApE9WLz3S8tqA9Dk3r9LF
-rJy8km9cBt1O9SQZwFsduGKGdF3Fd+/Y0V7UrFDzrX+NIzqcmgBHKxaIXorMBF70
-ajMaaROP2ymkpEXnruEwoR47fbW+JRAWDRm2xnouQveQX9ZcgCLbBvAWBqpndQj2
-DGmLJhNz5GlFBjh3PQZlU1w8hU7TrDxa7M1GMtVnk8X+o3l/MX9iPeEs+PiC4dHD
-hpj84RY1VQJz8+10rql47SB5YgbwcqaizTG4ax/OAv1JHNWtfAodIMX8Y8X00zoz
-A20LQv880jCCNANVNbrXJ3h4X3xwW/C1X9vYk0shymZJbT5u17JbPD1cy39bA7kT
-F4L7scdQRxvcqazYN4/IdgvgMji9OltiYufP88Ti8KB2tcl2accpiC5St/zllGD1
-hqEeYLMzjyvUKR/1uvURQQtc0DPvBRmvkB+aI4g+sLkTTFWj5bsA1vKU8SDCyMuB
-RQV11DId5+RNNCmWnskORUZJQssvY49pnfCxCES2nt3l/XzTzVtLYmd6G9uAqVac
-e2ibnmDrFVlmlyRsCiMfZl5/OTJzt7Cj3az59m5Syfw/lnS9YP82t/r/ufuKkO5Q
-q5a9aI8DuNNmAjR4lpIJNqIpX/y+dG2aGmx4XTc31MR9szWtiTgOHe0MkMupOAL0
-qkHrBgwo1zjuTMf3QOg6Z5Q=
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0y
-MjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vK
-EymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPan
-H05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jz
-kE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5B
-xxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uD
-JGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNV
-HSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1Ud
-IwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4E
-FgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/A
-Vn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTs
-Y4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48
-gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/
-TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMb
-SXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/chain-4.cert b/test/units/modules/cloud/amazon/fixtures/certs/chain-4.cert
deleted file mode 100644
index 2b82edf6c9..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/chain-4.cert
+++ /dev/null
@@ -1,121 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=prod.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-MIIIJDCCBgygAwIBAgIUP9S/56XvOFzWk1vp1+7JJT17brEwDQYJKoZIhvcNAQEL
-BQAwTTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxIzAh
-BgNVBAMTGlF1b1ZhZGlzIEdsb2JhbCBTU0wgSUNBIEczMB4XDTE5MDgyNzAzMTU1
-NFoXDTIxMDgyNzAzMjUwMFowgZwxCzAJBgNVBAYTAkFVMREwDwYDVQQIDAhWaWN0
-b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMSQwIgYDVQQKDBtUZWxzdHJhIENvcnBv
-cmF0aW9uIExpbWl0ZWQxFzAVBgNVBAsMDlRlbHN0cmEgRW5lcmd5MScwJQYDVQQD
-DB5wcm9kLmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb20wggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCrRouNZFOZwM1qyAU6v6ag9fzSx3y8zz36nR8HuqbA
-/wqrbMmnpofwdx/9u1bilsHfJzIODv0hm7aGk+neTK3DIapiII3m0HKW0v+GLsl7
-JkDuc2o3XlakcXlA45qDKCZXbXZtY4/kdxKG0OSUZi7oQqohhYl/c/ojrTiey+4G
-KhEVqWwOuQ1OC1DRw4qMH54d0koFxxSLPJ8JiiztLlK/e9n8BoJikj5fBqWy5R1F
-bGXCdzjcfmPV6iSOzJShpUgj4ga91mO6j3S6LLfK5ibbTlY+pmUxUT+m9nKMon3h
-mFptTYo9t9vUF/a/owjRxNLg01fJLNjYn8QV2vQvODGfAgMBAAGjggOqMIIDpjAJ
-BgNVHRMEAjAAMB8GA1UdIwQYMBaAFLMSibWpSzW8FQDwgOnYeIfxE3x2MHMGCCsG
-AQUFBwEBBGcwZTA3BggrBgEFBQcwAoYraHR0cDovL3RydXN0LnF1b3ZhZGlzZ2xv
-YmFsLmNvbS9xdnNzbGczLmNydDAqBggrBgEFBQcwAYYeaHR0cDovL29jc3AucXVv
-dmFkaXNnbG9iYWwuY29tMIGjBgNVHREEgZswgZiCHnByb2QuZW5lcmd5Lmluc2lk
-ZS50ZWxzdHJhLmNvbYImcmVwb3J0cy5wcm9kLmVuZXJneS5pbnNpZGUudGVsc3Ry
-YS5jb22CKGdyZWVuc3luYy5wcm9kLmVuZXJneS5pbnNpZGUudGVsc3RyYS5jb22C
-JG5nb3NzLnByb2QuZW5lcmd5Lmluc2lkZS50ZWxzdHJhLmNvbTBRBgNVHSAESjBI
-MEYGDCsGAQQBvlgAAmQBATA2MDQGCCsGAQUFBwIBFihodHRwOi8vd3d3LnF1b3Zh
-ZGlzZ2xvYmFsLmNvbS9yZXBvc2l0b3J5MB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
-BgEFBQcDATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnF1b3ZhZGlzZ2xv
-YmFsLmNvbS9xdnNzbGczLmNybDAdBgNVHQ4EFgQUoIME5TykVAI8VF5g0zeh0xdv
-i3owDgYDVR0PAQH/BAQDAgWgMIIBfgYKKwYBBAHWeQIEAgSCAW4EggFqAWgAdgBW
-FAaaL9fC7NP14b1Esj7HRna5vJkRXMDvlJhV1onQ3QAAAWzRG8r0AAAEAwBHMEUC
-IQDShuQyYMiy7KKxWOzffolVIcPRgWD7ClNEbIcUATHKyQIgXnTZBXcpcbXBQXLs
-tFuvY36TbKIYc2ql2nmdydGQ9wcAdgCkuQmQtBhYFIe7E6LMZ3AKPDWYBPkb37jj
-d80OyA3cEAAAAWzRG8sAAAAEAwBHMEUCIGsLEoA9S7pNE3VoNZHxl2IAdeP3Dy2Q
-Mk0rM46hp6CRAiEA08rOjswSdcn7qgDEoiyvlcrOTIFJAEcMlxSY65yLVUwAdgBV
-gdTCFpA2AUrqC5tXPFPwwOQ4eHAlCBcvo6odBxPTDAAAAWzRG8q7AAAEAwBHMEUC
-IAkVCcTFG8MBDI58JKIhMlPbzkdrKnYY3Kp9KqWuTAvMAiEAipeI7RCLBk8+T/p+
-gY7+vtFZxKDthcJMUpZz7qmica0wDQYJKoZIhvcNAQELBQADggIBAESe0U1qArxL
-F2uk65q6x6HBcZuSocpceokzcUBv07Kxs6UJU9ybTbl8VYPuC+OUdpvut1kOJCJm
-1TRrr5KMh+9as42xkbKRZnh5TQt7aHmVcLHLfA4x0UrELfNX3fVTDxwDAPAhE5oM
-0w+d1foLakh7dXKKSxobEI3KRwFp19iuZeIqwI8XMWMr9ajhTC0T7D2QvKotpNBS
-sNDHiIE3IXoa9o7UiOG8IfW0wAt7CEygv0F7ctHRTcQSP/SJIGYOUZ7uotULVL5i
-elG31Y83Jx3sPNCy4IZfCip6Gw7MgsN2CZGApqi49edSqDWyRIfmCeXtMc7XI7Md
-kqqWxbqGGTdYJCucoGqahqRR+BI9anEqTD9T5Gy0TpCi2pgp1i7czza71nfz0PcN
-R0pw/1lqb9AqmJ2XELpBpo82B9XGple9thpincai7jPk3ezY5eEvDTmkHRlUFCp8
-8M66Ga19hZTgnHPWDKZYZzuZ7Lcl2WbapFOYYHJggSpBRy4GkH6eTSkUB9G9k8vU
-gbvtS7sR5ggecbCBu0M4TWYmnUojR8UXtr0oOTlXysTHVGs5Tx9ChhOLyUqhX8tM
-1zSDT8JJvbbw4RqpGzBKTNaO5nxRLgKVQOQdM8f1kjMr9/U58Lc4UiaTkJM14VfK
-8GfV8+K/vRCBtME53ILvm1l18jtakG3c
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIGFzCCA/+gAwIBAgIUftbnnMmtgcTIGT75XUQodw40ExcwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjExMDYxNDUwMThaFw0y
-MjExMDYxNDUwMThaME0xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMSMwIQYDVQQDExpRdW9WYWRpcyBHbG9iYWwgU1NMIElDQSBHMzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANf8Od17be6c6lTGJDhEXpmkTs4y
-Q39Rr5VJyBeWCg06nSS71s6xF3sZvKcV0MbXlXCYM2ZX7cNTbJ81gs7uDsKFp+vK
-EymiKyEiI2SImOtECNnSg+RVR4np/xz/UlC0yFUisH75cZsJ8T1pkGMfiEouR0EM
-7O0uFgoboRfUP582TTWy0F7ynSA6YfGKnKj0OFwZJmGHVkLs1VevWjhj3R1fsPan
-H05P5moePFnpQdj1FofoSxUHZ0c7VB+sUimboHm/uHNY1LOsk77qiSuVC5/yrdg3
-2EEfP/mxJYT4r/5UiD7VahySzeZHzZ2OibQm2AfgfMN3l57lCM3/WPQBhMAPS1jz
-kE+7MjajM2f0aZctimW4Hasrj8AQnfAdHqZehbhtXaAlffNEzCdpNK584oCTVR7N
-UR9iZFx83ruTqpo+GcLP/iSYqhM4g7fy45sNhU+IS+ca03zbxTl3TTlkofXunI5B
-xxE30eGSQpDZ5+iUJcEOAuVKrlYocFbB3KF45hwcbzPWQ1DcO2jFAapOtQzeS+MZ
-yZzT2YseJ8hQHKu8YrXZWwKaNfyl8kFkHUBDICowNEoZvBwRCQp8sgqL6YRZy0uD
-JGxmnC2e0BVKSjcIvmq/CRWH7yiTk9eWm73xrsg9iIyD/kwJEnLyIk8tR5V8p/hc
-1H2AjDrZH12PsZ45AgMBAAGjgfMwgfAwEgYDVR0TAQH/BAgwBgEB/wIBATARBgNV
-HSAECjAIMAYGBFUdIAAwOgYIKwYBBQUHAQEELjAsMCoGCCsGAQUFBzABhh5odHRw
-Oi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20wDgYDVR0PAQH/BAQDAgEGMB8GA1Ud
-IwQYMBaAFO3nb3Zav2DsSVvGpXe7chZxm8Q9MDsGA1UdHwQ0MDIwMKAuoCyGKmh0
-dHA6Ly9jcmwucXVvdmFkaXNnbG9iYWwuY29tL3F2cmNhMmczLmNybDAdBgNVHQ4E
-FgQUsxKJtalLNbwVAPCA6dh4h/ETfHYwDQYJKoZIhvcNAQELBQADggIBAFGm1Fqp
-RMiKr7a6h707M+km36PVXZnX1NZocCn36MrfRvphotbOCDm+GmRkar9ZMGhc8c/A
-Vn7JSCjwF9jNOFIOUyNLq0w4luk+Pt2YFDbgF8IDdx53xIo8Gv05e9xpTvQYaIto
-qeHbQjGXfSGc91olfX6JUwZlxxbhdJH+rxTFAg0jcbqToJoScWTfXSr1QRcNbSTs
-Y4CPG6oULsnhVvrzgldGSK+DxFi2OKcDsOKkV7W4IGg8Do2L/M588AfBnV8ERzpl
-qgMBBQxC2+0N6RdFHbmZt0HQE/NIg1s0xcjGx1XW3YTOfje31rmAXKHOehm4Bu48
-gr8gePq5cdQ2W9tA0Dnytb9wzH2SyPPIXRI7yNxaX9H8wYeDeeiKSSmQtfh1v5cV
-7RXvm8F6hLJkkco/HOW3dAUwZFcKsUH+1eUJKLN18eDGwB8yGawjHvOKqcfg5Lf/
-TvC7hgcx7pDYaCCaqHaekgUwXbB2Enzqr1fdwoU1c01W5YuQAtAx5wk1bf34Yq/J
-ph7wNXGvo88N0/EfP9AdVGmJzy7VuRXeVAOyjKAIeADMlwpjBRhcbs9m3dkqvoMb
-SXKJxv/hFmNgEOvOlaFsXX1dbKg1v+C1AzKAFdiuAIa62JzASiEhigqNSdqdTsOh
-8W8hdONuKKpe9zKedhBFAvuxhDgKmnySglYc
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQEL
-BQAwSDELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAc
-BgNVBAMTFVF1b1ZhZGlzIFJvb3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00
-MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
-aW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIgRzMwggIiMA0GCSqG
-SIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFhZiFf
-qq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMW
-n4rjyduYNM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ym
-c5GQYaYDFCDy54ejiK2toIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+
-O7q414AB+6XrW7PFXmAqMaCvN+ggOp+oMiwMzAkd056OXbxMmO7FGmh77FOm6RQ1
-o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+lV0POKa2Mq1W/xPtbAd0j
-IaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZoL1NesNKq
-IcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz
-8eQQsSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43eh
-vNURG3YBZwjgQQvD6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l
-7ZizlWNof/k19N+IxWA1ksB8aRxhlRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALG
-cC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIB
-BjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZIhvcNAQELBQAD
-ggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
-AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RC
-roijQ1h5fq7KpVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0Ga
-W/ZZGYjeVYg3UQt4XAoeo0L9x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4n
-lv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgzdWqTHBLmYF5vHX/JHyPLhGGfHoJE
-+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6XU/IyAgkwo1jwDQHV
-csaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+NwmNtd
-dbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNg
-KCLjsZWDzYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeM
-HVOyToV7BjjHLPj4sHKNJeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4
-WSr2Rz0ZiC3oheGe7IUIarFsNMkd7EgrO3jtZsSOeWmD3n+M
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-a.cert b/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-a.cert
deleted file mode 100644
index 1d9bbe2137..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-a.cert
+++ /dev/null
@@ -1,18 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-aaa
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-bbb
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-ccc
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-b.cert b/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-b.cert
deleted file mode 100644
index 1d9bbe2137..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/certs/simple-chain-b.cert
+++ /dev/null
@@ -1,18 +0,0 @@
-subject=/C=AU/ST=Victoria/L=Melbourne/O=Telstra Corporation Limited/OU=Telstra Energy/CN=dev.energy.inside.telstra.com
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
------BEGIN CERTIFICATE-----
-aaa
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Global SSL ICA G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-bbb
------END CERTIFICATE-----
-
-subject=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
-issuer=/C=BM/O=QuoVadis Limited/CN=QuoVadis Root CA 2 G3
------BEGIN CERTIFICATE-----
-ccc
------END CERTIFICATE-----
-
diff --git a/test/units/modules/cloud/amazon/fixtures/thezip.zip b/test/units/modules/cloud/amazon/fixtures/thezip.zip
deleted file mode 100644
index 6eaefdd5ea..0000000000
--- a/test/units/modules/cloud/amazon/fixtures/thezip.zip
+++ /dev/null
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/.gitkeep b/test/units/modules/cloud/amazon/placebo_recordings/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/.gitkeep
+++ /dev/null
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/associations_are_not_updated/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/associations_are_not_updated/directconnect.DescribeConnections_1.json
deleted file mode 100644
index 6fdcfb9431..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/associations_are_not_updated/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "df6f9966-5b55-11e7-a69f-95e467ba41d7",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:30:03 GMT",
-                "content-length": "214"
-            },
-            "RequestId": "df6f9966-5b55-11e7-a69f-95e467ba41d7",
-            "HTTPStatusCode": 200
-        },
-        "connections": [
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgq9rgot",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-connection",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/changed_properties/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/changed_properties/directconnect.DescribeConnections_1.json
deleted file mode 100644
index 9522315014..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/changed_properties/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 1,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "ded68d99-5b55-11e7-8bdd-db27cb754a2c",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:30:02 GMT",
-                "content-length": "214"
-            },
-            "RequestId": "ded68d99-5b55-11e7-8bdd-db27cb754a2c",
-            "HTTPStatusCode": 200
-        },
-        "connections": [
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgq9rgot",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-connection",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_does_not_exist/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_does_not_exist/directconnect.DescribeConnections_1.json
deleted file mode 100644
index d7de252318..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_does_not_exist/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "b9e352dd-5b55-11e7-9750-d97c605bdcae",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:29:00 GMT",
-                "content-length": "18"
-            },
-            "RequestId": "b9e352dd-5b55-11e7-9750-d97c605bdcae",
-            "HTTPStatusCode": 200
-        },
-        "connections": []
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_id/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_id/directconnect.DescribeConnections_1.json
deleted file mode 100644
index 362a5c4769..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_id/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "b8f5493c-5b55-11e7-a718-2b51b84a4672",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:28:58 GMT",
-                "content-length": "214"
-            },
-            "RequestId": "b8f5493c-5b55-11e7-a718-2b51b84a4672",
-            "HTTPStatusCode": 200
-        },
-        "connections": [
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgq9rgot",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-connection",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_name/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_name/directconnect.DescribeConnections_1.json
deleted file mode 100644
index 9c77ef8f0c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_exists_by_name/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "b9a0566c-5b55-11e7-9750-d97c605bdcae",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:29:00 GMT",
-                "content-length": "586"
-            },
-            "RequestId": "b9a0566c-5b55-11e7-9750-d97c605bdcae",
-            "HTTPStatusCode": 200
-        },
-        "connections": [
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgq9rgot",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-connection",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            },
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fh69i7ez",
-                "location": "PEH51",
-                "connectionName": "test2shertel",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            },
-            {
-                "connectionState": "deleted",
-                "connectionId": "dxcon-fgcw1bgr",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-2",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_status/directconnect.DescribeConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_status/directconnect.DescribeConnections_1.json
deleted file mode 100644
index 63c3d25051..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/connection_status/directconnect.DescribeConnections_1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "b85f71db-5b55-11e7-a718-2b51b84a4672",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:28:58 GMT",
-                "content-length": "214"
-            },
-            "RequestId": "b85f71db-5b55-11e7-a718-2b51b84a4672",
-            "HTTPStatusCode": 200
-        },
-        "connections": [
-            {
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgq9rgot",
-                "location": "EqSe2",
-                "connectionName": "ansible-test-connection",
-                "bandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2"
-            }
-        ]
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.CreateConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.CreateConnection_1.json
deleted file mode 100644
index 752206481c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.CreateConnection_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "connectionState": "requested",
-        "connectionId": "dxcon-fgbw50lg",
-        "location": "EqSe2",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "dfb3ce3c-5b55-11e7-8bdd-db27cb754a2c",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:30:03 GMT",
-                "content-length": "187"
-            },
-            "RequestId": "dfb3ce3c-5b55-11e7-8bdd-db27cb754a2c",
-            "HTTPStatusCode": 200
-        },
-        "connectionName": "ansible-test-2",
-        "bandwidth": "1Gbps",
-        "ownerAccount": "448830907657",
-        "region": "us-west-2"
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.DeleteConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.DeleteConnection_1.json
deleted file mode 100644
index 4e418abd58..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_connection/create_and_delete/directconnect.DeleteConnection_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "connectionState": "deleted",
-        "connectionId": "dxcon-fgbw50lg",
-        "location": "EqSe2",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "dfccd47d-5b55-11e7-8bdd-db27cb754a2c",
-                "content-type": "application/x-amz-json-1.1",
-                "date": "Tue, 27 Jun 2017 16:30:03 GMT",
-                "content-length": "185"
-            },
-            "RequestId": "dfccd47d-5b55-11e7-8bdd-db27cb754a2c",
-            "HTTPStatusCode": 200
-        },
-        "connectionName": "ansible-test-2",
-        "bandwidth": "1Gbps",
-        "ownerAccount": "448830907657",
-        "region": "us-west-2"
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteConnection_1.json
deleted file mode 100644
index 3916cfc4be..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteConnection_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "data": {
-        "bandwidth": "1Gbps",
-        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bf2372eb-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "216",
-                "date": "Mon, 24 Jul 2017 19:39:02 GMT"
-            },
-            "RequestId": "bf2372eb-70a7-11e7-83ab-ef16f9ac5159"
-        },
-        "location": "EqSe2",
-        "ownerAccount": "448830907657",
-        "region": "us-west-2",
-        "connectionState": "deleted",
-        "connectionId": "dxcon-ffx41o23"
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteLag_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteLag_1.json
deleted file mode 100644
index 6fcdcb87f8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DeleteLag_1.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "data": {
-        "lagState": "deleted",
-        "location": "EqSe2",
-        "region": "us-west-2",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bf437e0e-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "266",
-                "date": "Mon, 24 Jul 2017 19:39:02 GMT"
-            },
-            "RequestId": "bf437e0e-70a7-11e7-83ab-ef16f9ac5159"
-        },
-        "lagId": "dxlag-fgkk4dja",
-        "awsDevice": "EqSe2-1bwfvazist2k0",
-        "connections": [],
-        "connectionsBandwidth": "1Gbps",
-        "minimumLinks": 0,
-        "ownerAccount": "448830907657",
-        "numberOfConnections": 0,
-        "lagName": "ansible_lag_1"
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_1.json
deleted file mode 100644
index 3f97b141f1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bd224baf-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:59 GMT"
-            },
-            "RequestId": "bd224baf-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_2.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_2.json
deleted file mode 100644
index a6e0198e9d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bda84490-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:59 GMT"
-            },
-            "RequestId": "bda84490-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_3.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_3.json
deleted file mode 100644
index cb819f0f42..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeLags_3.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "be79c564-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:39:01 GMT"
-            },
-            "RequestId": "be79c564-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeVirtualInterfaces_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeVirtualInterfaces_1.json
deleted file mode 100644
index 19a8af3895..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DescribeVirtualInterfaces_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "virtualInterfaces": [],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "be66d9a3-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "24",
-                "date": "Mon, 24 Jul 2017 19:39:00 GMT"
-            },
-            "RequestId": "be66d9a3-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DisassociateConnectionFromLag_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DisassociateConnectionFromLag_1.json
deleted file mode 100644
index 70d1ed2f00..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.DisassociateConnectionFromLag_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "data": {
-        "bandwidth": "1Gbps",
-        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bf0c687a-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "218",
-                "date": "Mon, 24 Jul 2017 19:39:01 GMT"
-            },
-            "RequestId": "bf0c687a-70a7-11e7-83ab-ef16f9ac5159"
-        },
-        "location": "EqSe2",
-        "ownerAccount": "448830907657",
-        "region": "us-west-2",
-        "connectionState": "requested",
-        "connectionId": "dxcon-ffx41o23"
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.UpdateLag_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.UpdateLag_1.json
deleted file mode 100644
index e464a0dd8c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections/directconnect.UpdateLag_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "data": {
-        "lagState": "pending",
-        "location": "EqSe2",
-        "region": "us-west-2",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bef64869-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "509",
-                "date": "Mon, 24 Jul 2017 19:39:01 GMT"
-            },
-            "RequestId": "bef64869-70a7-11e7-83ab-ef16f9ac5159"
-        },
-        "lagId": "dxlag-fgkk4dja",
-        "awsDevice": "EqSe2-1bwfvazist2k0",
-        "connections": [
-            {
-                "bandwidth": "1Gbps",
-                "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                "location": "EqSe2",
-                "ownerAccount": "448830907657",
-                "lagId": "dxlag-fgkk4dja",
-                "region": "us-west-2",
-                "connectionState": "requested",
-                "connectionId": "dxcon-ffx41o23"
-            }
-        ],
-        "connectionsBandwidth": "1Gbps",
-        "minimumLinks": 0,
-        "ownerAccount": "448830907657",
-        "numberOfConnections": 1,
-        "lagName": "ansible_lag_1"
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_1.json
deleted file mode 100644
index 1aa22210e2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bc1aedd9-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:57 GMT"
-            },
-            "RequestId": "bc1aedd9-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_2.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_2.json
deleted file mode 100644
index 5643faeeac..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bc4902ba-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:57 GMT"
-            },
-            "RequestId": "bc4902ba-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_3.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_3.json
deleted file mode 100644
index a1792e1c2f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeLags_3.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bc7ff13c-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:57 GMT"
-            },
-            "RequestId": "bc7ff13c-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeVirtualInterfaces_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeVirtualInterfaces_1.json
deleted file mode 100644
index 5092b8726f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_lag_with_connections_without_force_delete/directconnect.DescribeVirtualInterfaces_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "virtualInterfaces": [],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bc6dc8cb-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "24",
-                "date": "Mon, 24 Jul 2017 19:38:57 GMT"
-            },
-            "RequestId": "bc6dc8cb-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_nonexistent_lag/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_nonexistent_lag/directconnect.DescribeLags_1.json
deleted file mode 100644
index 6bc71aa730..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/delete_nonexistent_lag/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "data": {
-        "Error": {
-            "Code": "DirectConnectClientException",
-            "Message": "Could not find Lag with ID dxlag-XXXXXXXX"
-        },
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "HTTPHeaders": {
-                "connection": "close",
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "bb67ca78-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "95",
-                "date": "Mon, 24 Jul 2017 19:38:56 GMT"
-            },
-            "RequestId": "bb67ca78-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 400
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true/directconnect.DescribeLags_1.json
deleted file mode 100644
index 2b29b0bf41..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b8662323-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:50 GMT"
-            },
-            "RequestId": "b8662323-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true_no/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true_no/directconnect.DescribeLags_1.json
deleted file mode 100644
index e73e68b8d3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_changed_true_no/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b91b4255-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:52 GMT"
-            },
-            "RequestId": "b91b4255-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists/directconnect.DescribeLags_1.json
deleted file mode 100644
index 01821531b8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b5e4a858-70a7-11e7-a69f-95e467ba41d7",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:46 GMT"
-            },
-            "RequestId": "b5e4a858-70a7-11e7-a69f-95e467ba41d7"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists_using_name/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists_using_name/directconnect.DescribeLags_1.json
deleted file mode 100644
index 26ebd06311..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_exists_using_name/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-9uinh2jjnuu9",
-                "connections": [],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "sherteltestlag",
-                "lagId": "dxlag-fgr4lfqt"
-            },
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            },
-            {
-                "awsDevice": "EqSe2-2bii1jufy4y7p",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgytkicv",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgytkicv",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-fgsxammv"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_2",
-                "lagId": "dxlag-fgytkicv"
-            },
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgee5gk5"
-            },
-            {
-                "awsDevice": "EqSe2-2bii1jufy4y7p",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_2_update",
-                "lagId": "dxlag-fg0hj0n3"
-            },
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-ffg1zmo4"
-            },
-            {
-                "awsDevice": "EqSe2-2oqu43nde4cs1",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_2_update",
-                "lagId": "dxlag-ffzm4jk8"
-            },
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-ffuid1ql"
-            },
-            {
-                "awsDevice": "EqSe2-2oqu43nde4cs1",
-                "connections": [],
-                "lagState": "deleted",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 0,
-                "lagName": "ansible_lag_2_update",
-                "lagId": "dxlag-ffpq2qa7"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b6a0a55a-70a7-11e7-a69f-95e467ba41d7",
-                "content-length": "2920",
-                "date": "Mon, 24 Jul 2017 19:38:49 GMT"
-            },
-            "RequestId": "b6a0a55a-70a7-11e7-a69f-95e467ba41d7"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_status/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_status/directconnect.DescribeLags_1.json
deleted file mode 100644
index fa32a2cf45..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/lag_status/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-1bwfvazist2k0",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgkk4dja",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgkk4dja",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-ffx41o23"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_1",
-                "lagId": "dxlag-fgkk4dja"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b4aa057e-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:44 GMT"
-            },
-            "RequestId": "b4aa057e-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_does_not_exist/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_does_not_exist/directconnect.DescribeLags_1.json
deleted file mode 100644
index 0b394f15ea..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_does_not_exist/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "data": {
-        "Error": {
-            "Code": "DirectConnectClientException",
-            "Message": "Could not find Lag with ID dxlag-XXXXXXXX"
-        },
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "HTTPHeaders": {
-                "connection": "close",
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b7f55ff2-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "95",
-                "date": "Mon, 24 Jul 2017 19:38:50 GMT"
-            },
-            "RequestId": "b7f55ff2-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 400
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_status/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_status/directconnect.DescribeLags_1.json
deleted file mode 100644
index e1464bd7c2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/nonexistent_lag_status/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "data": {
-        "Error": {
-            "Code": "DirectConnectClientException",
-            "Message": "Lag ID doesntexist has an invalid format."
-        },
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "HTTPHeaders": {
-                "connection": "close",
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b3c76dc0-70a7-11e7-a2a8-21d8bda1f5ec",
-                "content-length": "95",
-                "date": "Mon, 24 Jul 2017 19:38:42 GMT"
-            },
-            "RequestId": "b3c76dc0-70a7-11e7-a2a8-21d8bda1f5ec"
-        }
-    },
-    "status_code": 400
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_1.json
deleted file mode 100644
index 20434bbd08..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-2bii1jufy4y7p",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgytkicv",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgytkicv",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-fgsxammv"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_2",
-                "lagId": "dxlag-fgytkicv"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "b9cc69e9-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "520",
-                "date": "Mon, 24 Jul 2017 19:38:53 GMT"
-            },
-            "RequestId": "b9cc69e9-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_2.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_2.json
deleted file mode 100644
index 08847e89d9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.DescribeLags_2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "data": {
-        "lags": [
-            {
-                "awsDevice": "EqSe2-2bii1jufy4y7p",
-                "connections": [
-                    {
-                        "bandwidth": "1Gbps",
-                        "connectionName": "Requested Connection 1 for Lag dxlag-fgytkicv",
-                        "location": "EqSe2",
-                        "ownerAccount": "448830907657",
-                        "lagId": "dxlag-fgytkicv",
-                        "region": "us-west-2",
-                        "connectionState": "requested",
-                        "connectionId": "dxcon-fgsxammv"
-                    }
-                ],
-                "lagState": "pending",
-                "minimumLinks": 0,
-                "location": "EqSe2",
-                "connectionsBandwidth": "1Gbps",
-                "ownerAccount": "448830907657",
-                "region": "us-west-2",
-                "numberOfConnections": 1,
-                "lagName": "ansible_lag_2_update",
-                "lagId": "dxlag-fgytkicv"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "ba91197b-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "527",
-                "date": "Mon, 24 Jul 2017 19:38:54 GMT"
-            },
-            "RequestId": "ba91197b-70a7-11e7-83ab-ef16f9ac5159"
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.UpdateLag_1.json b/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.UpdateLag_1.json
deleted file mode 100644
index da5475f713..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/aws_direct_connect_link_aggregation_group/update_lag/directconnect.UpdateLag_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "data": {
-        "lagState": "pending",
-        "location": "EqSe2",
-        "region": "us-west-2",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "content-type": "application/x-amz-json-1.1",
-                "x-amzn-requestid": "ba76658a-70a7-11e7-83ab-ef16f9ac5159",
-                "content-length": "516",
-                "date": "Mon, 24 Jul 2017 19:38:54 GMT"
-            },
-            "RequestId": "ba76658a-70a7-11e7-83ab-ef16f9ac5159"
-        },
-        "lagId": "dxlag-fgytkicv",
-        "awsDevice": "EqSe2-2bii1jufy4y7p",
-        "connections": [
-            {
-                "bandwidth": "1Gbps",
-                "connectionName": "Requested Connection 1 for Lag dxlag-fgytkicv",
-                "location": "EqSe2",
-                "ownerAccount": "448830907657",
-                "lagId": "dxlag-fgytkicv",
-                "region": "us-west-2",
-                "connectionState": "requested",
-                "connectionId": "dxcon-fgsxammv"
-            }
-        ],
-        "connectionsBandwidth": "1Gbps",
-        "minimumLinks": 0,
-        "ownerAccount": "448830907657",
-        "numberOfConnections": 1,
-        "lagName": "ansible_lag_2_update"
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.CreateStack_1.json
deleted file mode 100644
index 36f1489ba2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "03fbfc36-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "03fbfc36-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:07 GMT",
-                "content-length": "393",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DeleteStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DeleteStack_1.json
deleted file mode 100644
index d526155a5a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DeleteStack_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "170d1e02-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "170d1e02-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT",
-                "content-length": "212",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 3758c77b7e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "043d4a05-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "043d4a05-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:08 GMT",
-                "content-length": "1183",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index 2c5a7655ea..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "075d9d71-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "075d9d71-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:13 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_3.json
deleted file mode 100644
index cf2c245021..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_3.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0a7eb31b-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0a7eb31b-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:19 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_4.json
deleted file mode 100644
index 32ee9c1c5b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_4.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0d9e1c06-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0d9e1c06-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:24 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_5.json
deleted file mode 100644
index b547cd4d8e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_5.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "10bd84ca-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "10bd84ca-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:29 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_6.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_6.json
deleted file mode 100644
index 15bd043ab2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_6.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_COMPLETE-2017-10-20T19:51:33.200Z",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 33,
-                    "microsecond": 200000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "13dbb3fd-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "13dbb3fd-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "3490",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:34 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_7.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_7.json
deleted file mode 100644
index 87db7c59e0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStackEvents_7.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "140d7220-b5d0-11e7-933f-50a686be7356",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 35,
-                    "microsecond": 121000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_COMPLETE-2017-10-20T19:51:33.200Z",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 33,
-                    "microsecond": 200000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-basic-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "LogicalResourceId": "ansible-test-basic-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "16faf590-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "16faf590-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "4276",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index 7acdb3acfb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EnableTerminationProtection": false,
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "StackStatusReason": "User Initiated",
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "042974db-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "042974db-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:08 GMT",
-                "content-length": "975",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_2.json
deleted file mode 100644
index 0ed674b20f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_2.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "074b26dc-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "074b26dc-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:13 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_3.json
deleted file mode 100644
index 633c5e159c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_3.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0a6cb1b3-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0a6cb1b3-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:18 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_4.json
deleted file mode 100644
index e5ca69dda1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_4.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0d8cddf1-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0d8cddf1-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:23 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_5.json
deleted file mode 100644
index 31a3057cd6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_5.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "10ac94d5-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "10ac94d5-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:28 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_6.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_6.json
deleted file mode 100644
index 90ca7467c2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_6.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "13caeb1b-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "13caeb1b-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:33 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_7.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_7.json
deleted file mode 100644
index 905c04f48b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/basic_s3_stack/cloudformation.DescribeStacks_7.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-basic-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "Outputs": [
-                    {
-                        "OutputKey": "TheName",
-                        "OutputValue": "ansible-test-basic-yaml-mybucket-13m2y4v8bptj4"
-                    }
-                ],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-basic-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_COMPLETE",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "16ea53bb-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "16ea53bb-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT",
-                "content-length": "1115",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.CreateStack_1.json
deleted file mode 100644
index 9084936a45..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "03fbfc36-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "03fbfc36-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:07 GMT",
-                "content-length": "393",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DeleteStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DeleteStack_1.json
deleted file mode 100644
index d526155a5a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DeleteStack_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "170d1e02-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "170d1e02-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT",
-                "content-length": "212",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 399eab4961..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "043d4a05-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "043d4a05-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:08 GMT",
-                "content-length": "1183",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index f57dbf5362..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "075d9d71-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "075d9d71-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:13 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_3.json
deleted file mode 100644
index c8b4d694df..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_3.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0a7eb31b-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0a7eb31b-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:19 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_4.json
deleted file mode 100644
index 8bb03eded1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_4.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0d9e1c06-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0d9e1c06-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:24 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_5.json
deleted file mode 100644
index 311949d084..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_5.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "10bd84ca-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "10bd84ca-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "2730",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:29 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_6.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_6.json
deleted file mode 100644
index ddab94a518..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_6.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_COMPLETE-2017-10-20T19:51:33.200Z",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 33,
-                    "microsecond": 200000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "13dbb3fd-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "13dbb3fd-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "3490",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:34 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_7.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_7.json
deleted file mode 100644
index 86da5fb456..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStackEvents_7.json
+++ /dev/null
@@ -1,124 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "140d7220-b5d0-11e7-933f-50a686be7356",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 35,
-                    "microsecond": 121000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_COMPLETE-2017-10-20T19:51:33.200Z",
-                "ResourceStatus": "CREATE_COMPLETE",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 33,
-                    "microsecond": 200000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:12.754Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 12,
-                    "microsecond": 754000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "Resource creation Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "MyBucket-CREATE_IN_PROGRESS-2017-10-20T19:51:11.159Z",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::S3::Bucket",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 11,
-                    "microsecond": 159000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "ResourceProperties": "{}\n",
-                "PhysicalResourceId": "",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "MyBucket"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EventId": "04032730-b5d0-11e7-86b8-503ac93168c5",
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "ResourceStatusReason": "User Initiated",
-                "StackName": "ansible-test-client-request-token-yaml",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "ClientRequestToken": "3faf3fb5-b289-41fc-b940-44151828f6cf",
-                "LogicalResourceId": "ansible-test-client-request-token-yaml"
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "16faf590-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "16faf590-b5d0-11e7-ae09-550cfe4b2358",
-                "vary": "Accept-Encoding",
-                "content-length": "4276",
-                "content-type": "text/xml",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index 7734b0ca37..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "EnableTerminationProtection": false,
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "StackStatusReason": "User Initiated",
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "042974db-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "042974db-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:08 GMT",
-                "content-length": "975",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_2.json
deleted file mode 100644
index 0a1e74d707..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_2.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "074b26dc-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "074b26dc-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:13 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_3.json
deleted file mode 100644
index 12d5839f81..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_3.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0a6cb1b3-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0a6cb1b3-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:18 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_4.json
deleted file mode 100644
index a3cb0a8ca2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_4.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "0d8cddf1-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "0d8cddf1-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:23 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_5.json
deleted file mode 100644
index 251d71fa1e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_5.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "10ac94d5-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "10ac94d5-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:28 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_6.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_6.json
deleted file mode 100644
index 2251125f6e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_6.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "13caeb1b-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "13caeb1b-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:33 GMT",
-                "content-length": "913",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_7.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_7.json
deleted file mode 100644
index aa8c7fd098..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/client_request_token_s3_stack/cloudformation.DescribeStacks_7.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-client-request-token-yaml/04023cd0-b5d0-11e7-86b8-503ac93168c5",
-                "Description": "Basic template that creates an S3 bucket",
-                "Tags": [],
-                "Outputs": [
-                    {
-                        "OutputKey": "TheName",
-                        "OutputValue": "ansible-test-client-request-token-yaml-mybucket-13m2y4v8bptj4"
-                    }
-                ],
-                "EnableTerminationProtection": false,
-                "CreationTime": {
-                    "hour": 19,
-                    "__class__": "datetime",
-                    "month": 10,
-                    "second": 8,
-                    "microsecond": 324000,
-                    "year": 2017,
-                    "day": 20,
-                    "minute": 51
-                },
-                "StackName": "ansible-test-client-request-token-yaml",
-                "NotificationARNs": [],
-                "StackStatus": "CREATE_COMPLETE",
-                "DisableRollback": false,
-                "RollbackConfiguration": {}
-            }
-        ],
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200,
-            "RequestId": "16ea53bb-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "16ea53bb-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:39 GMT",
-                "content-length": "1115",
-                "content-type": "text/xml"
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 109feacd92..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "RequestId": "179d9e46-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "179d9e46-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:40 GMT",
-                "content-length": "301",
-                "content-type": "text/xml",
-                "connection": "close"
-            }
-        },
-        "Error": {
-            "Message": "Stack [ansible-test-nonexist] does not exist",
-            "Code": "ValidationError",
-            "Type": "Sender"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index 589f92cc6e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "RequestId": "17d80f44-b5d0-11e7-80c4-9f499f779cdb",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "17d80f44-b5d0-11e7-80c4-9f499f779cdb",
-                "date": "Fri, 20 Oct 2017 19:51:40 GMT",
-                "content-length": "301",
-                "content-type": "text/xml",
-                "connection": "close"
-            }
-        },
-        "Error": {
-            "Message": "Stack [ansible-test-nonexist] does not exist",
-            "Code": "ValidationError",
-            "Type": "Sender"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index ea227415c5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/delete_nonexistent_stack/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "RequestId": "175fab26-b5d0-11e7-9d9b-45815c77100a",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "175fab26-b5d0-11e7-9d9b-45815c77100a",
-                "date": "Fri, 20 Oct 2017 19:51:40 GMT",
-                "content-length": "307",
-                "content-type": "text/xml",
-                "connection": "close"
-            }
-        },
-        "Error": {
-            "Message": "Stack with id ansible-test-nonexist does not exist",
-            "Code": "ValidationError",
-            "Type": "Sender"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/get_nonexistent_stack/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/get_nonexistent_stack/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index cf29c6c769..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/get_nonexistent_stack/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "RequestId": "181566c8-b5d0-11e7-9d9b-45815c77100a",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "181566c8-b5d0-11e7-9d9b-45815c77100a",
-                "date": "Fri, 20 Oct 2017 19:51:41 GMT",
-                "content-length": "307",
-                "content-type": "text/xml",
-                "connection": "close"
-            }
-        },
-        "Error": {
-            "Message": "Stack with id ansible-test-nonexist does not exist",
-            "Code": "ValidationError",
-            "Type": "Sender"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/invalid_template_json/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/invalid_template_json/cloudformation.CreateStack_1.json
deleted file mode 100644
index 7ad6cac96f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/invalid_template_json/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "ResponseMetadata": {
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400,
-            "RequestId": "03b1107f-b5d0-11e7-ae09-550cfe4b2358",
-            "HTTPHeaders": {
-                "x-amzn-requestid": "03b1107f-b5d0-11e7-ae09-550cfe4b2358",
-                "date": "Fri, 20 Oct 2017 19:51:07 GMT",
-                "content-length": "320",
-                "content-type": "text/xml",
-                "connection": "close"
-            }
-        },
-        "Error": {
-            "Message": "Template format error: JSON not well-formed. (line 4, column 4)",
-            "Code": "ValidationError",
-            "Type": "Sender"
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.CreateStack_1.json
deleted file mode 100644
index 64c8e1f23b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-        "ResponseMetadata": {
-            "RequestId": "c741ebcd-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "c741ebcd-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "407",
-                "date": "Tue, 26 Feb 2019 21:37:55 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 7a6a496440..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "c74b1310-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "c7b0b337-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "c7b0b337-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "1153",
-                "date": "Tue, 26 Feb 2019 21:37:56 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index 6218ed8b86..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:38:01.107Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 1,
-                    "microsecond": 107000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: ca5769ae-3a0e-11e9-a183-3f277586a4cb)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.657Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 657000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.221Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 221000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "c74b1310-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "caf667e9-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "caf667e9-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "4312",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:38:01 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_3.json
deleted file mode 100644
index cde6beb8ee..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_3.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "cafc8250-3a0e-11e9-86c5-02035744c0fa",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Delete requested by user."
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:38:01.107Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 1,
-                    "microsecond": 107000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: ca5769ae-3a0e-11e9-a183-3f277586a4cb)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.657Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 657000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.221Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 221000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "c74b1310-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "ce498af1-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "ce498af1-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "5207",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:38:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_4.json
deleted file mode 100644
index 4f35d6ddc9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_4.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "d19c8600-3a0e-11e9-a4ba-0a3524ef8042",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 13,
-                    "microsecond": 177000
-                },
-                "ResourceStatus": "DELETE_COMPLETE"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-DELETE_COMPLETE-2019-02-26T21:38:12.486Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 12,
-                    "microsecond": 486000
-                },
-                "ResourceStatus": "DELETE_COMPLETE",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-DELETE_IN_PROGRESS-2019-02-26T21:38:12.139Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 12,
-                    "microsecond": 139000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "cafc8250-3a0e-11e9-86c5-02035744c0fa",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Delete requested by user."
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:38:01.107Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 1,
-                    "microsecond": 107000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: ca5769ae-3a0e-11e9-a183-3f277586a4cb)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.657Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 657000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.221Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 221000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "c74b1310-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d19fbb1b-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "d19fbb1b-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "7857",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:38:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_5.json
deleted file mode 100644
index 68a743f89e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStackEvents_5.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "d19c8600-3a0e-11e9-a4ba-0a3524ef8042",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 13,
-                    "microsecond": 177000
-                },
-                "ResourceStatus": "DELETE_COMPLETE"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-DELETE_COMPLETE-2019-02-26T21:38:12.486Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 12,
-                    "microsecond": 486000
-                },
-                "ResourceStatus": "DELETE_COMPLETE",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-DELETE_IN_PROGRESS-2019-02-26T21:38:12.139Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 12,
-                    "microsecond": 139000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "cafc8250-3a0e-11e9-86c5-02035744c0fa",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Delete requested by user."
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:38:01.107Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 1,
-                    "microsecond": 107000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: ca5769ae-3a0e-11e9-a183-3f277586a4cb)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.657Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-8jlpw72yz5x8",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 657000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:38:00.221Z",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 0,
-                    "microsecond": 221000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "EventId": "c74b1310-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "LogicalResourceId": "ansible-test-on-create-failure-delete",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d4fbddab-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "d4fbddab-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "7857",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:38:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index cf5f86acbd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "StackStatusReason": "User Initiated",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "c77fb823-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "c77fb823-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "1041",
-                "date": "Tue, 26 Feb 2019 21:37:56 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_2.json
deleted file mode 100644
index 71a9f54b68..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_2.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "cad153b2-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "cad153b2-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "979",
-                "date": "Tue, 26 Feb 2019 21:38:01 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_3.json
deleted file mode 100644
index c2028183bd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_3.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "DeletionTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "DELETE_IN_PROGRESS",
-                "StackStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Delete requested by user.",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "ce24289a-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "ce24289a-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "1171",
-                "date": "Tue, 26 Feb 2019 21:38:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_4.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_4.json
deleted file mode 100644
index 89f8355319..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_4.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "DeletionTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "DELETE_IN_PROGRESS",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d16c27f2-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "d16c27f2-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "1041",
-                "date": "Tue, 26 Feb 2019 21:38:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_5.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_5.json
deleted file mode 100644
index 739c829376..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_delete/cloudformation.DescribeStacks_5.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-delete/c74a4fc0-3a0e-11e9-9a48-067794494828",
-                "StackName": "ansible-test-on-create-failure-delete",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 37,
-                    "second": 55,
-                    "microsecond": 909000
-                },
-                "DeletionTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 38,
-                    "second": 2,
-                    "microsecond": 76000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "DELETE_COMPLETE",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d4c90dd6-3a0e-11e9-b25f-d1217e6893bf",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "d4c90dd6-3a0e-11e9-b25f-d1217e6893bf",
-                "content-type": "text/xml",
-                "content-length": "965",
-                "date": "Tue, 26 Feb 2019 21:38:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.CreateStack_1.json
deleted file mode 100644
index 86f1945fd6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-        "ResponseMetadata": {
-            "RequestId": "a396a58a-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a396a58a-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "411",
-                "date": "Tue, 26 Feb 2019 21:44:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DeleteStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DeleteStack_1.json
deleted file mode 100644
index 1a3a67c640..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DeleteStack_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "a78f0832-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a78f0832-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "212",
-                "date": "Tue, 26 Feb 2019 21:44:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 58d7a89e41..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "a39e6ce0-3a0f-11e9-96ca-02f46dd00950",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ansible-test-on-create-failure-do-nothing",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 5,
-                    "microsecond": 553000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a406cc84-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a406cc84-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "1169",
-                "date": "Tue, 26 Feb 2019 21:44:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index 0a7e32e468..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "a6c32c80-3a0f-11e9-ac5e-06deb474fa52",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ansible-test-on-create-failure-do-nothing",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 10,
-                    "microsecond": 804000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. "
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:44:09.905Z",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-a8g0mh5il4t5",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 9,
-                    "microsecond": 905000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: a62a6f71-3a0f-11e9-9164-457e0a3a5e1b)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:44:09.497Z",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-a8g0mh5il4t5",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 9,
-                    "microsecond": 497000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:44:09.076Z",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 9,
-                    "microsecond": 76000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "EventId": "a39e6ce0-3a0f-11e9-96ca-02f46dd00950",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "LogicalResourceId": "ansible-test-on-create-failure-do-nothing",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 5,
-                    "microsecond": 553000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a75fbad0-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a75fbad0-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "5231",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:44:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index 532143313b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 5,
-                    "microsecond": 553000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "StackStatusReason": "User Initiated",
-                "DisableRollback": true,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a3d44acf-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a3d44acf-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "1048",
-                "date": "Tue, 26 Feb 2019 21:44:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_2.json
deleted file mode 100644
index df17f5a730..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_do_nothing/cloudformation.DescribeStacks_2.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-do-nothing/a39dd0a0-3a0f-11e9-96ca-02f46dd00950",
-                "StackName": "ansible-test-on-create-failure-do-nothing",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 44,
-                    "second": 5,
-                    "microsecond": 553000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "CREATE_FAILED",
-                "StackStatusReason": "The following resource(s) failed to create: [ECRRepo]. ",
-                "DisableRollback": true,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a7301f4a-3a0f-11e9-b7db-3fe3824c73cb",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "a7301f4a-3a0f-11e9-b7db-3fe3824c73cb",
-                "content-type": "text/xml",
-                "content-length": "1084",
-                "date": "Tue, 26 Feb 2019 21:44:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.CreateStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.CreateStack_1.json
deleted file mode 100644
index f71422b92a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.CreateStack_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-        "ResponseMetadata": {
-            "RequestId": "9139de54-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "9139de54-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "409",
-                "date": "Tue, 26 Feb 2019 21:43:34 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DeleteStack_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DeleteStack_1.json
deleted file mode 100644
index 111dc90d81..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DeleteStack_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "988b3097-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "988b3097-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "212",
-                "date": "Tue, 26 Feb 2019 21:43:46 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_1.json
deleted file mode 100644
index 2bcac7f0e1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_1.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "9140bc10-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "9199b1a7-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "9199b1a7-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "1161",
-                "date": "Tue, 26 Feb 2019 21:43:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_2.json
deleted file mode 100644
index 3992fd3973..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_2.json
+++ /dev/null
@@ -1,121 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "945b90a0-3a0f-11e9-adaf-0211d8bec7e2",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 920000
-                },
-                "ResourceStatus": "ROLLBACK_IN_PROGRESS",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Rollback requested by user."
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:43:39.210Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 210000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: 93e0bb60-3a0f-11e9-a53c-7162bb423e4d)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:43:38.793Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 38,
-                    "microsecond": 793000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:43:38.266Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 38,
-                    "microsecond": 266000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "9140bc10-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "94e16307-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "94e16307-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "5241",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:43:40 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_3.json
deleted file mode 100644
index e272c734b7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStackEvents_3.json
+++ /dev/null
@@ -1,180 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "StackEvents": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "9743bc70-3a0f-11e9-b335-0ade61d04ee6",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 44,
-                    "microsecond": 797000
-                },
-                "ResourceStatus": "ROLLBACK_COMPLETE"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-DELETE_COMPLETE-2019-02-26T21:43:43.908Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 43,
-                    "microsecond": 908000
-                },
-                "ResourceStatus": "DELETE_COMPLETE",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-DELETE_IN_PROGRESS-2019-02-26T21:43:43.478Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 43,
-                    "microsecond": 478000
-                },
-                "ResourceStatus": "DELETE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "945b90a0-3a0f-11e9-adaf-0211d8bec7e2",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 920000
-                },
-                "ResourceStatus": "ROLLBACK_IN_PROGRESS",
-                "ResourceStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Rollback requested by user."
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_FAILED-2019-02-26T21:43:39.210Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 210000
-                },
-                "ResourceStatus": "CREATE_FAILED",
-                "ResourceStatusReason": "Invalid parameter at 'PolicyText' failed to satisfy constraint: 'Invalid repository policy provided' (Service: AmazonECR; Status Code: 400; Error Code: InvalidParameterException; Request ID: 93e0bb60-3a0f-11e9-a53c-7162bb423e4d)",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:43:38.793Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "ansib-ecrre-1lsnxu2zpb20l",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 38,
-                    "microsecond": 793000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "Resource creation Initiated",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "ECRRepo-CREATE_IN_PROGRESS-2019-02-26T21:43:38.266Z",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ECRRepo",
-                "PhysicalResourceId": "",
-                "ResourceType": "AWS::ECR::Repository",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 38,
-                    "microsecond": 266000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceProperties": "{\"RepositoryPolicyText\":{\"Version\":\"3000-10-17\",\"Statement\":[{\"Action\":[\"ecr:*\"],\"Effect\":\"Allow\",\"Principal\":{\"AWS\":\"arn:aws:iam::123456789012:root\"}}]}}"
-            },
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "EventId": "9140bc10-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "LogicalResourceId": "ansible-test-on-create-failure-rollback",
-                "PhysicalResourceId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "ResourceType": "AWS::CloudFormation::Stack",
-                "Timestamp": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "ResourceStatus": "CREATE_IN_PROGRESS",
-                "ResourceStatusReason": "User Initiated"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "982d0bff-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "982d0bff-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "7911",
-                "vary": "Accept-Encoding",
-                "date": "Tue, 26 Feb 2019 21:43:45 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_1.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_1.json
deleted file mode 100644
index 25facea18d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "CREATE_IN_PROGRESS",
-                "StackStatusReason": "User Initiated",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "91725383-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "91725383-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "1045",
-                "date": "Tue, 26 Feb 2019 21:43:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_2.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_2.json
deleted file mode 100644
index 55a80d8afe..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_2.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "DeletionTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 920000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "ROLLBACK_IN_PROGRESS",
-                "StackStatusReason": "The following resource(s) failed to create: [ECRRepo]. . Rollback requested by user.",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "94bb1651-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "94bb1651-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "1179",
-                "date": "Tue, 26 Feb 2019 21:43:40 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_3.json b/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_3.json
deleted file mode 100644
index 7c00a83644..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/cloudformation/on_create_failure_rollback/cloudformation.DescribeStacks_3.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "Stacks": [
-            {
-                "StackId": "arn:aws:cloudformation:us-west-2:123456789012:stack/ansible-test-on-create-failure-rollback/914046e0-3a0f-11e9-94bf-0a9edf17d014",
-                "StackName": "ansible-test-on-create-failure-rollback",
-                "CreationTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 34,
-                    "microsecond": 740000
-                },
-                "DeletionTime": {
-                    "__class__": "datetime",
-                    "year": 2019,
-                    "month": 2,
-                    "day": 26,
-                    "hour": 21,
-                    "minute": 43,
-                    "second": 39,
-                    "microsecond": 920000
-                },
-                "RollbackConfiguration": {},
-                "StackStatus": "ROLLBACK_COMPLETE",
-                "DisableRollback": false,
-                "NotificationARNs": [],
-                "Tags": [],
-                "EnableTerminationProtection": false,
-                "DriftInformation": {
-                    "StackDriftStatus": "NOT_CHECKED"
-                }
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "98016814-3a0f-11e9-b938-97983b40cabe",
-            "HTTPStatusCode": 200,
-            "HTTPHeaders": {
-                "x-amzn-requestid": "98016814-3a0f-11e9-b938-97983b40cabe",
-                "content-type": "text/xml",
-                "content-length": "1044",
-                "date": "Tue, 26 Feb 2019 21:43:45 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    }
-}
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ActivatePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ActivatePipeline_1.json
deleted file mode 100644
index 3ae6a8c5e9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ActivatePipeline_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "bf44512b-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:16 GMT",
-                "x-amzn-requestid": "bf44512b-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "2"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 63717ea588..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "bf07bcc3-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:15 GMT",
-                "x-amzn-requestid": "bf07bcc3-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_10.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_10.json
deleted file mode 100644
index d4fa7c93a3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_10.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "e9c3fc64-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:27 GMT",
-                "x-amzn-requestid": "e9c3fc64-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_11.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_11.json
deleted file mode 100644
index dc391e35cd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_11.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "efcd17aa-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:37 GMT",
-                "x-amzn-requestid": "efcd17aa-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_12.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_12.json
deleted file mode 100644
index 475493c94d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_12.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f5dcc189-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:47 GMT",
-                "x-amzn-requestid": "f5dcc189-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_13.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_13.json
deleted file mode 100644
index 4bf47d64ad..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_13.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "fbea4982-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:58 GMT",
-                "x-amzn-requestid": "fbea4982-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_14.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_14.json
deleted file mode 100644
index 7b48febb09..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_14.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "01f44f22-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:08 GMT",
-                "x-amzn-requestid": "01f44f22-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_15.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_15.json
deleted file mode 100644
index 0c0eb8c29f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_15.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "07fd6963-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:18 GMT",
-                "x-amzn-requestid": "07fd6963-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_16.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_16.json
deleted file mode 100644
index 5ccba8f779..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_16.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "0e065d77-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:28 GMT",
-                "x-amzn-requestid": "0e065d77-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_17.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_17.json
deleted file mode 100644
index be45d91099..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_17.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "140f9f9e-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:38 GMT",
-                "x-amzn-requestid": "140f9f9e-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_18.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_18.json
deleted file mode 100644
index 6171a53c16..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_18.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "1a197dcb-68ca-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:48 GMT",
-                "x-amzn-requestid": "1a197dcb-68ca-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_19.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_19.json
deleted file mode 100644
index 6bb36e61e2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_19.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "2024946b-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:24:58 GMT",
-                "x-amzn-requestid": "2024946b-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index a7b37943d8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "bf3116b5-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:16 GMT",
-                "x-amzn-requestid": "bf3116b5-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_20.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_20.json
deleted file mode 100644
index b281b83c24..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_20.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "262e24bf-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:08 GMT",
-                "x-amzn-requestid": "262e24bf-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_21.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_21.json
deleted file mode 100644
index 0fa7e03920..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_21.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "2c360727-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:19 GMT",
-                "x-amzn-requestid": "2c360727-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_22.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_22.json
deleted file mode 100644
index e4cc111a27..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_22.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "323eacc0-68ca-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:28 GMT",
-                "x-amzn-requestid": "323eacc0-68ca-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_23.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_23.json
deleted file mode 100644
index c8c2886625..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_23.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "38524edf-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:38 GMT",
-                "x-amzn-requestid": "38524edf-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_24.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_24.json
deleted file mode 100644
index c176c52319..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_24.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "3e591fbf-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:49 GMT",
-                "x-amzn-requestid": "3e591fbf-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_25.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_25.json
deleted file mode 100644
index ee58417ac0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_25.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "44623acf-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:25:59 GMT",
-                "x-amzn-requestid": "44623acf-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_26.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_26.json
deleted file mode 100644
index 08c8d7dce0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_26.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "4a6d5137-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:09 GMT",
-                "x-amzn-requestid": "4a6d5137-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_27.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_27.json
deleted file mode 100644
index 167d756f28..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_27.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "5073d37b-68ca-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:19 GMT",
-                "x-amzn-requestid": "5073d37b-68ca-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_28.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_28.json
deleted file mode 100644
index 33b821dbb6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_28.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "567d8b04-68ca-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:29 GMT",
-                "x-amzn-requestid": "567d8b04-68ca-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_29.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_29.json
deleted file mode 100644
index a5b75c0fe0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_29.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "5c86a656-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:39 GMT",
-                "x-amzn-requestid": "5c86a656-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index 024c77bc0d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "bf84b4fb-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:16 GMT",
-                "x-amzn-requestid": "bf84b4fb-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_30.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_30.json
deleted file mode 100644
index 66b7db2098..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_30.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "62984c6d-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:50 GMT",
-                "x-amzn-requestid": "62984c6d-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_31.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_31.json
deleted file mode 100644
index 4a34e4f770..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_31.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "689f4441-68ca-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:26:59 GMT",
-                "x-amzn-requestid": "689f4441-68ca-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_32.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_32.json
deleted file mode 100644
index b118228ce2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_32.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "6eab44f8-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:27:10 GMT",
-                "x-amzn-requestid": "6eab44f8-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_33.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_33.json
deleted file mode 100644
index ac867d5636..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_33.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "74b375a8-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:27:20 GMT",
-                "x-amzn-requestid": "74b375a8-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_34.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_34.json
deleted file mode 100644
index 52189066f0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_34.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "74c54ffa-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:27:20 GMT",
-                "x-amzn-requestid": "74c54ffa-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_35.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_35.json
deleted file mode 100644
index ba46b9a9c7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_35.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "74d6dc2b-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:27:20 GMT",
-                "x-amzn-requestid": "74d6dc2b-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_36.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_36.json
deleted file mode 100644
index 372cef7c6e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_36.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "74e8dd8c-68ca-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:27:20 GMT",
-                "x-amzn-requestid": "74e8dd8c-68ca-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index 32e58f0c89..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "c58f574c-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:27 GMT",
-                "x-amzn-requestid": "c58f574c-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_5.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_5.json
deleted file mode 100644
index 116adce1bc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_5.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "cb97871c-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:36 GMT",
-                "x-amzn-requestid": "cb97871c-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_6.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_6.json
deleted file mode 100644
index 47f2779281..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_6.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d19f69b0-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:47 GMT",
-                "x-amzn-requestid": "d19f69b0-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_7.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_7.json
deleted file mode 100644
index 6dfbd436e5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_7.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "d7aa0b78-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:56 GMT",
-                "x-amzn-requestid": "d7aa0b78-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_8.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_8.json
deleted file mode 100644
index 16f0f602b8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_8.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "ddb19f29-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:06 GMT",
-                "x-amzn-requestid": "ddb19f29-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_9.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_9.json
deleted file mode 100644
index 1c3727b2a5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.DescribePipelines_9.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:22:17",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:18",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "2",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "e3ba9338-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:23:17 GMT",
-                "x-amzn-requestid": "e3ba9338-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 27f67f45db..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_pipeline/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "bf1ca4df-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:15 GMT",
-                "x-amzn-requestid": "bf1ca4df-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ActivatePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ActivatePipeline_1.json
deleted file mode 100644
index 7fb2d13c89..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ActivatePipeline_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "f6f52c07-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:40 GMT",
-                "x-amzn-requestid": "f6f52c07-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "2"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index d8807dcd05..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f6e15657-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:39 GMT",
-                "x-amzn-requestid": "f6e15657-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_10.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_10.json
deleted file mode 100644
index 7a261f6872..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_10.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "27ea4875-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:02 GMT",
-                "x-amzn-requestid": "27ea4875-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_11.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_11.json
deleted file mode 100644
index d9d9673f8c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_11.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "2df3155e-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:12 GMT",
-                "x-amzn-requestid": "2df3155e-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_12.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_12.json
deleted file mode 100644
index f860a119a7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_12.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "33fca5d4-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:22 GMT",
-                "x-amzn-requestid": "33fca5d4-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_13.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_13.json
deleted file mode 100644
index ad068259a1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_13.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "3a06aa5e-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:32 GMT",
-                "x-amzn-requestid": "3a06aa5e-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_14.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_14.json
deleted file mode 100644
index 4e801743a3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_14.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "4010fe25-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:42 GMT",
-                "x-amzn-requestid": "4010fe25-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_15.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_15.json
deleted file mode 100644
index 50c37c7553..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_15.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "461a8e6d-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:18:52 GMT",
-                "x-amzn-requestid": "461a8e6d-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_16.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_16.json
deleted file mode 100644
index bf50700a9d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_16.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "4c241ddb-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:02 GMT",
-                "x-amzn-requestid": "4c241ddb-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_17.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_17.json
deleted file mode 100644
index 5ea0b2f1cf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_17.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "522e9922-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:12 GMT",
-                "x-amzn-requestid": "522e9922-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_18.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_18.json
deleted file mode 100644
index a3a346d4bf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_18.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "583569c6-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:22 GMT",
-                "x-amzn-requestid": "583569c6-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_19.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_19.json
deleted file mode 100644
index 6969db9d07..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_19.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "5e400aef-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:33 GMT",
-                "x-amzn-requestid": "5e400aef-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index d955bd9b55..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f79eb2fb-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:40 GMT",
-                "x-amzn-requestid": "f79eb2fb-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "816"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_20.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_20.json
deleted file mode 100644
index 26c98fbc3e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_20.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "644b972f-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:43 GMT",
-                "x-amzn-requestid": "644b972f-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_21.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_21.json
deleted file mode 100644
index 5826dd80c0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_21.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "6a55756a-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:19:53 GMT",
-                "x-amzn-requestid": "6a55756a-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_22.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_22.json
deleted file mode 100644
index 7fb32f718e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_22.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "705f79f8-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:03 GMT",
-                "x-amzn-requestid": "705f79f8-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_23.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_23.json
deleted file mode 100644
index 1415967347..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_23.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "76690aa7-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:13 GMT",
-                "x-amzn-requestid": "76690aa7-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_24.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_24.json
deleted file mode 100644
index f9afda9bf8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_24.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "7c73f9be-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:23 GMT",
-                "x-amzn-requestid": "7c73f9be-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_25.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_25.json
deleted file mode 100644
index cd7b8af2b2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_25.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "827b3ff5-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:33 GMT",
-                "x-amzn-requestid": "827b3ff5-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_26.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_26.json
deleted file mode 100644
index 59d320a665..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_26.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "88843410-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:44 GMT",
-                "x-amzn-requestid": "88843410-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_27.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_27.json
deleted file mode 100644
index 0ed0329bcb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_27.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "8e8e3994-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:20:53 GMT",
-                "x-amzn-requestid": "8e8e3994-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_28.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_28.json
deleted file mode 100644
index 5964c9068a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_28.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "949928d8-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:04 GMT",
-                "x-amzn-requestid": "949928d8-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_29.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_29.json
deleted file mode 100644
index 5b3efb65ec..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_29.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "9aa502aa-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:15 GMT",
-                "x-amzn-requestid": "9aa502aa-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index fa529208da..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "fda8b75e-68c8-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:51 GMT",
-                "x-amzn-requestid": "fda8b75e-68c8-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_30.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_30.json
deleted file mode 100644
index a946262892..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_30.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a0aee145-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:24 GMT",
-                "x-amzn-requestid": "a0aee145-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_31.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_31.json
deleted file mode 100644
index 4bb2e2167b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_31.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "a6bf4ec4-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:34 GMT",
-                "x-amzn-requestid": "a6bf4ec4-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_32.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_32.json
deleted file mode 100644
index 020f71260a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_32.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "acc70a54-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:44 GMT",
-                "x-amzn-requestid": "acc70a54-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_33.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_33.json
deleted file mode 100644
index 3bf3fde68f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_33.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "acda9253-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:44 GMT",
-                "x-amzn-requestid": "acda9253-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_34.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_34.json
deleted file mode 100644
index 286fb67b9a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_34.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "aceb5aed-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "aceb5aed-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_35.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_35.json
deleted file mode 100644
index 2908a3f350..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_35.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "acfff4a4-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "acfff4a4-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index 7427bc9a12..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "03b295e1-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:01 GMT",
-                "x-amzn-requestid": "03b295e1-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_5.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_5.json
deleted file mode 100644
index 0f4ad7ab8c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_5.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "09bb89f0-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:11 GMT",
-                "x-amzn-requestid": "09bb89f0-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_6.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_6.json
deleted file mode 100644
index 209eefb959..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_6.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "0fc6eeb0-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:21 GMT",
-                "x-amzn-requestid": "0fc6eeb0-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_7.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_7.json
deleted file mode 100644
index 4aae89cd73..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_7.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "15ce3481-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:31 GMT",
-                "x-amzn-requestid": "15ce3481-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_8.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_8.json
deleted file mode 100644
index b99a4ef9c6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_8.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "1bd74fa4-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:41 GMT",
-                "x-amzn-requestid": "1bd74fa4-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_9.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_9.json
deleted file mode 100644
index daf99bec68..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.DescribePipelines_9.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "21e06a01-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:17:51 GMT",
-                "x-amzn-requestid": "21e06a01-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 52bbd4d4b4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/activate_without_population/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "f6d10235-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:39 GMT",
-                "x-amzn-requestid": "f6d10235-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_false/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_false/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index dd143dadfd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_false/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "Error": {
-            "Message": "Pipeline with id: df-015440025PF7YGLDK47C does not exist",
-            "Code": "PipelineDeletedException"
-        },
-        "ResponseMetadata": {
-            "RequestId": "be8212fd-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:15 GMT",
-                "x-amzn-requestid": "be8212fd-68c9-11e7-b0eb-93771d0a5156",
-                "content-length": "106",
-                "cneonction": "close",
-                "content-type": "application/x-amz-json-1.1"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_true/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_true/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 6d06e0d93e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_exists_true/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "be402786-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:14 GMT",
-                "x-amzn-requestid": "be402786-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_status/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_status/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 23a454b445..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/check_dp_status/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "bec5ab3e-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:15 GMT",
-                "x-amzn-requestid": "bec5ab3e-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.CreatePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.CreatePipeline_1.json
deleted file mode 100644
index d3d66fc780..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.CreatePipeline_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineId": "df-09359422DAX2M66ZHFVF",
-        "ResponseMetadata": {
-            "RequestId": "ad608b38-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "ad608b38-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "40"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DeletePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DeletePipeline_1.json
deleted file mode 100644
index 4eb0f69f7c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DeletePipeline_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "adf8fab8-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:46 GMT",
-                "x-amzn-requestid": "adf8fab8-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "0"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 20feb7186d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:21:46",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-09359422DAX2M66ZHFVF",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "9fee08b05473783e91357fadb089e036",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-09359422DAX2M66ZHFVF"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "ad8e790b-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "ad8e790b-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "757"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index 343e78e399..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:21:46",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-09359422DAX2M66ZHFVF",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "9fee08b05473783e91357fadb089e036",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-09359422DAX2M66ZHFVF"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "ad9f6906-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "ad9f6906-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "757"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index c98007e22f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:21:46",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-09359422DAX2M66ZHFVF",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "9fee08b05473783e91357fadb089e036",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-09359422DAX2M66ZHFVF"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "adb27bcf-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:46 GMT",
-                "x-amzn-requestid": "adb27bcf-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "757"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index 619eb3b0a4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:21:46",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-09359422DAX2M66ZHFVF",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "9fee08b05473783e91357fadb089e036",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-09359422DAX2M66ZHFVF"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "adc31da7-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:47 GMT",
-                "x-amzn-requestid": "adc31da7-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "757"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_5.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_5.json
deleted file mode 100644
index ad10c0b785..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:21:46",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-09359422DAX2M66ZHFVF",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "9fee08b05473783e91357fadb089e036",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-09359422DAX2M66ZHFVF"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "add67e94-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:46 GMT",
-                "x-amzn-requestid": "add67e94-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "757"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_6.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_6.json
deleted file mode 100644
index ceebab8bc9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.DescribePipelines_6.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "Error": {
-            "Message": "Pipeline with id: df-09359422DAX2M66ZHFVF does not exist",
-            "Code": "PipelineDeletedException"
-        },
-        "ResponseMetadata": {
-            "RequestId": "aeac4532-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:47 GMT",
-                "x-amzn-requestid": "aeac4532-68c9-11e7-b9c1-53eb374c7a33",
-                "content-length": "106",
-                "cneonction": "close",
-                "content-type": "application/x-amz-json-1.1"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 52879777aa..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "ad4c18d7-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:45 GMT",
-                "x-amzn-requestid": "ad4c18d7-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_2.json
deleted file mode 100644
index db5bca68ec..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline/datapipeline.ListPipelines_2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-unittest-create-pipeline",
-                "id": "df-09359422DAX2M66ZHFVF"
-            },
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "ade6f959-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:47 GMT",
-                "x-amzn-requestid": "ade6f959-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "189"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 9674b9a98a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f514fa3e-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:37 GMT",
-                "x-amzn-requestid": "f514fa3e-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index 16a6b01681..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f53e7b42-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:37 GMT",
-                "x-amzn-requestid": "f53e7b42-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index 88e2b83b6b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f54f4483-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:36 GMT",
-                "x-amzn-requestid": "f54f4483-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index 73be9690ba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f561bb16-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:37 GMT",
-                "x-amzn-requestid": "f561bb16-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.GetPipelineDefinition_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.GetPipelineDefinition_1.json
deleted file mode 100644
index 37bfa29459..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.GetPipelineDefinition_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineObjects": [],
-        "ResponseMetadata": {
-            "RequestId": "f525c381-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:36 GMT",
-                "x-amzn-requestid": "f525c381-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "22"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.ListPipelines_1.json
deleted file mode 100644
index ee0f182843..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_already_exists/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "f503e33c-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:37 GMT",
-                "x-amzn-requestid": "f503e33c-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.CreatePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.CreatePipeline_1.json
deleted file mode 100644
index 3bd2a7cc24..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.CreatePipeline_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineId": "df-04922542NBJ1I10KYE8",
-        "ResponseMetadata": {
-            "RequestId": "aefed20e-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "aefed20e-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "39"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DeletePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DeletePipeline_1.json
deleted file mode 100644
index d289367b24..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DeletePipeline_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "af93e632-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:49 GMT",
-                "x-amzn-requestid": "af93e632-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "0"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 5078ca0081..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "af23e641-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "af23e641-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "872"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index d959f9229c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "af35c095-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "af35c095-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "872"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index f70515744d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "af47c1f9-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "af47c1f9-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "872"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index dfb972d03b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "af5ecc6b-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "af5ecc6b-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "872"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_5.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_5.json
deleted file mode 100644
index 0891366991..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_5.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "af70a6bd-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "af70a6bd-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "872"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_6.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_6.json
deleted file mode 100644
index 5ee0110b82..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_6.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:49",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:21:50",
-                        "key": "@deletionRequestTime"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-unittest-create-pipeline_tags",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-04922542NBJ1I10KYE8",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "DELETING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "644685a53f98d695792be5e2e69f6504",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-unittest-create-pipeline_tags",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "afe22d47-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:49 GMT",
-                "x-amzn-requestid": "afe22d47-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "940"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_7.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_7.json
deleted file mode 100644
index d47b5f1c9b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.DescribePipelines_7.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "Error": {
-            "Message": "Pipeline with id: df-04922542NBJ1I10KYE8 does not exist",
-            "Code": "PipelineDeletedException"
-        },
-        "ResponseMetadata": {
-            "RequestId": "b5eb4768-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:00 GMT",
-                "x-amzn-requestid": "b5eb4768-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-length": "105",
-                "cneonction": "close",
-                "content-type": "application/x-amz-json-1.1"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 734f84e239..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "aeec5b7d-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:48 GMT",
-                "x-amzn-requestid": "aeec5b7d-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_2.json
deleted file mode 100644
index 5483637318..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/create_pipeline_with_tags/datapipeline.ListPipelines_2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            },
-            {
-                "name": "ansible-unittest-create-pipeline_tags",
-                "id": "df-04922542NBJ1I10KYE8"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "af82f640-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:21:49 GMT",
-                "x-amzn-requestid": "af82f640-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "193"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 0f9e4f5aba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f656a27e-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f656a27e-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index f083c7f202..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f66a5120-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:39 GMT",
-                "x-amzn-requestid": "f66a5120-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index 38e30295b6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f67b1a71-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f67b1a71-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index 096d457c0f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f68d9103-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f68d9103-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 2a8689ca44..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/deactivate_pipeline/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "f6458b0d-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:39 GMT",
-                "x-amzn-requestid": "f6458b0d-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 1c8801e98c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f5e569e0-68c8-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f5e569e0-68c8-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.PutPipelineDefinition_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.PutPipelineDefinition_1.json
deleted file mode 100644
index 37d4f9ace4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/define_pipeline/datapipeline.PutPipelineDefinition_1.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "validationErrors": [],
-        "validationWarnings": [],
-        "errored": false,
-        "ResponseMetadata": {
-            "RequestId": "f5f855d7-68c8-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f5f855d7-68c8-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "63"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_nonexistent_pipeline/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_nonexistent_pipeline/datapipeline.ListPipelines_1.json
deleted file mode 100644
index 16a7c9b444..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_nonexistent_pipeline/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "b62fa386-68c9-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:00 GMT",
-                "x-amzn-requestid": "b62fa386-68c9-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.CreatePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.CreatePipeline_1.json
deleted file mode 100644
index 9d780e9e67..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.CreatePipeline_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineId": "df-056994639BPQCQAZSAGU",
-        "ResponseMetadata": {
-            "RequestId": "b680d0bb-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:01 GMT",
-                "x-amzn-requestid": "b680d0bb-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "40"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DeletePipeline_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DeletePipeline_1.json
deleted file mode 100644
index f26a6c61c9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DeletePipeline_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "ResponseMetadata": {
-            "RequestId": "b718cb0a-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b718cb0a-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "0"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 6a542412cd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b6a82ede-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:01 GMT",
-                "x-amzn-requestid": "b6a82ede-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "836"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_2.json
deleted file mode 100644
index beeabe990b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_2.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b6baa570-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:01 GMT",
-                "x-amzn-requestid": "b6baa570-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "836"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_3.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_3.json
deleted file mode 100644
index 52b679aafa..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_3.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b6cd9131-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b6cd9131-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "836"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_4.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_4.json
deleted file mode 100644
index d518615901..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_4.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b6e11933-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b6e11933-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "836"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_5.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_5.json
deleted file mode 100644
index a66c459d6b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_5.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b6f3dde4-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b6f3dde4-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "836"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_6.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_6.json
deleted file mode 100644
index 8cc97aee2b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_6.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "[{\"key\":\"ansible\",\"value\":\"test\"}]",
-                        "key": "*tags"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:01",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:22:02",
-                        "key": "@deletionRequestTime"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-nonexistent",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-056994639BPQCQAZSAGU",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "DELETING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "861ec422f1889d1124a9e84e63e37708",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-nonexistent",
-                "description": "ansible-test-nonexistent",
-                "tags": [
-                    {
-                        "value": "test",
-                        "key": "ansible"
-                    }
-                ],
-                "pipelineId": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "b75fbf1d-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b75fbf1d-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "904"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_7.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_7.json
deleted file mode 100644
index a9982a489d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.DescribePipelines_7.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "Error": {
-            "Message": "Pipeline with id: df-056994639BPQCQAZSAGU does not exist",
-            "Code": "PipelineDeletedException"
-        },
-        "ResponseMetadata": {
-            "RequestId": "bd6a133d-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:13 GMT",
-                "x-amzn-requestid": "bd6a133d-68c9-11e7-b0eb-93771d0a5156",
-                "content-length": "106",
-                "cneonction": "close",
-                "content-type": "application/x-amz-json-1.1"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_1.json
deleted file mode 100644
index e8de70f8dd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_1.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "b66f4488-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:01 GMT",
-                "x-amzn-requestid": "b66f4488-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "114"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_2.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_2.json
deleted file mode 100644
index cefd11b5a1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/delete_pipeline/datapipeline.ListPipelines_2.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineIdList": [
-            {
-                "name": "ansible-test-create-pipeline",
-                "id": "df-0590406117G8DPQZY2HA"
-            },
-            {
-                "name": "ansible-test-nonexistent",
-                "id": "df-056994639BPQCQAZSAGU"
-            }
-        ],
-        "hasMoreResults": false,
-        "ResponseMetadata": {
-            "RequestId": "b706c9a6-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:02 GMT",
-                "x-amzn-requestid": "b706c9a6-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "181"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 851f9e2a9c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@lastActivationTime"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:42",
-                        "key": "@finishedTime"
-                    },
-                    {
-                        "stringValue": "1",
-                        "key": "@version"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "FINISHED",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    },
-                    {
-                        "stringValue": "2017-07-14T19:16:40",
-                        "key": "@firstActivationTime"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "bdbbdcc2-68c9-11e7-b0eb-93771d0a5156",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:13 GMT",
-                "x-amzn-requestid": "bdbbdcc2-68c9-11e7-b0eb-93771d0a5156",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "980"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description_nonexistent/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description_nonexistent/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 9125d89dd2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_description_nonexistent/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "status_code": 400,
-    "data": {
-        "Error": {
-            "Message": "Pipeline with id: df-015440025PF7YGLDK47C does not exist",
-            "Code": "PipelineDeletedException"
-        },
-        "ResponseMetadata": {
-            "RequestId": "bdfe3c7d-68c9-11e7-8d5f-8781ccf20ee6",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:22:13 GMT",
-                "x-amzn-requestid": "bdfe3c7d-68c9-11e7-8d5f-8781ccf20ee6",
-                "content-length": "106",
-                "cneonction": "close",
-                "content-type": "application/x-amz-json-1.1"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 400
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_field/datapipeline.DescribePipelines_1.json b/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_field/datapipeline.DescribePipelines_1.json
deleted file mode 100644
index 0061b15d43..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/data_pipeline/pipeline_field/datapipeline.DescribePipelines_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "status_code": 200,
-    "data": {
-        "pipelineDescriptionList": [
-            {
-                "fields": [
-                    {
-                        "stringValue": "2017-07-14T19:16:35",
-                        "key": "@creationTime"
-                    },
-                    {
-                        "stringValue": "ansible-datapipeline-unit-test",
-                        "key": "description"
-                    },
-                    {
-                        "stringValue": "PIPELINE",
-                        "key": "@sphere"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "pipelineCreator"
-                    },
-                    {
-                        "stringValue": "ansible-test-create-pipeline",
-                        "key": "name"
-                    },
-                    {
-                        "stringValue": "df-0590406117G8DPQZY2HA",
-                        "key": "@id"
-                    },
-                    {
-                        "stringValue": "PENDING",
-                        "key": "@pipelineState"
-                    },
-                    {
-                        "stringValue": "448830907657",
-                        "key": "@accountId"
-                    },
-                    {
-                        "stringValue": "881b104bff5f07052e897bd79048b951",
-                        "key": "uniqueId"
-                    },
-                    {
-                        "stringValue": "AIDAJKBIP5ANB55M7EUTC",
-                        "key": "@userId"
-                    }
-                ],
-                "name": "ansible-test-create-pipeline",
-                "description": "ansible-datapipeline-unit-test",
-                "tags": [],
-                "pipelineId": "df-0590406117G8DPQZY2HA"
-            }
-        ],
-        "ResponseMetadata": {
-            "RequestId": "f5a52c58-68c8-11e7-b9c1-53eb374c7a33",
-            "HTTPHeaders": {
-                "date": "Fri, 14 Jul 2017 19:16:38 GMT",
-                "x-amzn-requestid": "f5a52c58-68c8-11e7-b9c1-53eb374c7a33",
-                "content-type": "application/x-amz-json-1.1",
-                "content-length": "749"
-            },
-            "RetryAttempts": 0,
-            "HTTPStatusCode": 200
-        }
-    }
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_1.json
deleted file mode 100644
index 2b8018f254..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "22cf9d88-b0ca-4a6c-8bfa-a2969541f25b",
-            "HTTPHeaders": {
-                "content-length": "249",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_2.json
deleted file mode 100644
index 540cb22d86..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnectionRoute_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ee7493f2-1db0-4edb-a2c8-66dc31c41df8",
-            "HTTPHeaders": {
-                "content-length": "249",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 16510d83d4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9b06e28e",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b0fe4793-77a1-4c92-978c-975c7b963c59",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 30d8ac08ee..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "92162d1f-1563-4b14-8fc5-0821c50687cb",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:48 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 97f64fd252..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9843e24b-c094-451f-9be3-3f859dc39385",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5887",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index d67ec8ac01..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d5d76451-0539-4de2-a197-dac87c4eb91b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:17:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index c61544026a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7906c368-77fc-4afc-9ee4-c822dab4864e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:17:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 95032ac3f5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b9e2ca97-e467-4dcc-a8fc-eff788e8ed49",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:17:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 76d21af3c2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "249f8e82-8137-4b69-8002-969e880dbcd2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 101822a5d9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "554aea72-2359-4c35-956b-1cd55c3b1ded",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index a4fd2ecce7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a9203775-14d5-4020-aa61-f6709cd6c455",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:32 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 6092812e21..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 18,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c0621c72-8851-4c34-9d3d-7ae4bb5de50f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index ef7b5d3723..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 18,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "62aae2fc-e699-4a66-9bea-1b4b2b26ce35",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_18.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_18.json
deleted file mode 100644
index afa295f3bf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_18.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 18,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0d20ed3c-a88e-42ba-87cc-f573d22b0a11",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_19.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_19.json
deleted file mode 100644
index 320101d50c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_19.json
+++ /dev/null
@@ -1,235 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [
-                    {
-                        "DestinationCidrBlock": "195.168.2.0/24",
-                        "State": "available"
-                    },
-                    {
-                        "DestinationCidrBlock": "196.168.2.0/24",
-                        "State": "available"
-                    }
-                ],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 2,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 18,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 2,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 23,
-                            "minute": 17,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d5ce628c-8270-4bb8-b0d9-c68b5834a9a8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:18:48 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 12e36ed156..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "96ef43c9-1210-47a7-87f7-22c85a05eb2b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_20.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_20.json
deleted file mode 100644
index bca4926485..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_20.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "Routes": [
-                    {
-                        "DestinationCidrBlock": "196.168.2.0/24",
-                        "State": "deleted"
-                    },
-                    {
-                        "DestinationCidrBlock": "195.168.2.0/24",
-                        "State": "deleted"
-                    }
-                ],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3a0d05ae-dbf7-4885-9b50-db2899bc30d5",
-            "HTTPHeaders": {
-                "content-length": "1066",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:18:48 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index b868885c82..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c4fb8aa0-39ad-4333-9b45-25b48ce5a8cd",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:22 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 619c486624..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b728a197-4790-4987-afe1-23ba2d2edf55",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:38 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 9ab3007c3a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "06bdac8b-d1ec-48d6-9af4-b2d5bf3fa2f4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:55 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 193586bf44..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "baefffe5-7638-423e-84fc-fd21fa7fc6d1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:16:10 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index b8569545ef..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "591329e5-78f5-4655-90c0-bf2b312b54af",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:16:26 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 66e29949af..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4e526b69-b5ea-4f05-a81b-831aa5825e18",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:16:42 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 35f035130d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_routes/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9b06e28e",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9b06e28e\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.38</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.11.116.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.37</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>OwpaQwQaVjEM2nWZRYOhh3.TxgU5QyG1</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.130</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.13.135</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.129</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oIbjSO1e2SVBqRuW2PzKn.CgsAdSOMME</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.11.116.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.13.135",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 7,
-                            "minute": 15,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "534f5ec5-2d5f-46ac-8216-453fc4cad713",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:16:58 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateTags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateTags_1.json
deleted file mode 100644
index 8af115a96e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateTags_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9661b9b4-e18b-491b-8182-6548bfb680bb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:12:21 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index e7cd28ab8b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9e06e28b",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0c445bcd-4e37-4368-b45d-b4560bde459f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5236",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index e190e232a7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8deda3c9-1498-44ef-a663-111e93657c7f",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:22 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 6d975f1ac7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e3c0cd84-d327-4a9e-8cac-0361a0afaaac",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "4836",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 6066eb507b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3888db16-157b-404a-9fea-fe27e8bd556d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:11:34 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 92d1f1e7f5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ada7d223-32a6-4b60-81bb-63bca2cb2d56",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:11:50 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index e60cb21cec..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "def174a4-c5c2-4e5b-a5b6-1c2448e869f1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 055f7de90e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7c65999e-0e70-4aac-a720-b2216dbe70af",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:20 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index e199f3c0fc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1153ff47-87b6-40b1-bcdd-ae66c4d4a3ae",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:21 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index f67a916094..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c0748f40-1e33-4f0b-9417-77092bfc9090",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:21 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 8b6d7e2d30..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 41,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 11,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "16aa6a4d-0fca-4035-b607-c223fc424f81",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:12:22 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 78a05ba860..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0d463b0f-87ea-4ada-a79a-f2bb0910c31c",
-            "HTTPHeaders": {
-                "content-length": "878",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:22 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 5c0dea83c3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bab29653-3411-49bb-af70-3d7b3284ca06",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 3b47382cf9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d3732d64-34fb-40eb-bddb-c34e5e571921",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 701f05ae0a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bd3ccd25-a6d6-44cf-9371-f01ca22d3f57",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:10:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index f25da7060f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "36906e17-078f-4c15-9e01-af3e233af2d3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:10:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index f8aa9ec973..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "cab9bb1a-7afe-4c5f-b106-038b10cba813",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:10:31 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index 1a8a4f86aa..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "938c6207-f582-4935-bef5-a9e3b01e18e1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:10:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index e7f974dced..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0bf3fb58-412a-447c-8cf7-af7185ec7f93",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:11:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index dbbefcbc5a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/add_tags/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9e06e28b\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.212.254.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>b2DU0T9yhIWbDPukoG2NBtbPNrruDTRm</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.106</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.160.254.75</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.105</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>FOhYu_zZqXdic2Bvm_dYS03ONJCK.LfP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.212.254.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.160.254.75",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b67d7024-2bad-4283-b440-5519b5541867",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:11:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 503422fc26..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9f06e28a",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3239a34a-f3ed-4ba7-9d31-99265ceda2a9",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5237",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 46de4d6ab4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bdcbf647-c1cc-4971-b133-3e1cd8ee36d5",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 835d53a9d9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "87d4db59-f8e6-4d4c-9800-7c0bda5ebee2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "4397",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:46 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 7ee030b7d8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "40e8326d-2f4b-4761-a2f9-011c989b0d11",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:08:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 9e4979b24f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 3,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5c5688ae-0f6e-4d88-adb6-d9f654c74b42",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:08 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index ba464dc252..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 3,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7a5c5c59-d48a-467b-9414-097a93c923ae",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 57967a5e57..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 3,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "cb26ba43-cfc6-466b-8bde-5e63d58728e0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 6f500939bb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 3,
-                            "minute": 9,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1005f435-3e86-461f-a96c-a4f45c32c795",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index 55bbb3116e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "edac5b19-14be-4b2d-ab47-a2279de47d40",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:09:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index a69976b556..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "07ee7fe5-c16a-4940-b099-3cd39aa9c2c8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index b1254a9ff9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7f34b516-b810-4a2b-8e9c-2e4ac5ea32f2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:07:03 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 9712811837..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3f0d6abf-421a-4e56-9f19-a95c4639cbe6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:07:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 71ccc5f0bf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8174eae1-ae94-492c-b8d3-369a912dc994",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:07:34 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 7fba5fbca6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ab76cd4e-9a69-48f4-8fa6-7b1ea9710f2d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:07:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index e98f0cead5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9e552112-f325-4d3e-bb3d-0698b69a9074",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:08:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 9f3c01830c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1c10aa65-e78f-41e5-bb24-7902b7974bff",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:08:21 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 863aa6350c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_nonmodifiable_attr/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9f06e28a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.114</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.43.202.248</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.113</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>spNJGPBQfzbK8hNvpHNOaaml_paRZNKs</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.70.185.193</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>yE7hnuavW4SzersgnMyKIoKbd0rE8giW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.43.202.248",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 47,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.70.185.193",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 8,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1963dfb1-564a-4a0c-932c-ecddcdb39d41",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:08:37 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateTags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateTags_1.json
deleted file mode 100644
index 32afe4c15d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateTags_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8738f361-b294-47d7-a6d7-82d289db5e5f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:06:44 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 0e22d719b0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9c06e289",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d94359a8-8a4f-4087-b848-27de6253ff6c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 0d225110b2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e780e8ce-5417-4a33-a39e-dd78a18b69a5",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 548dcfe963..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "35740449-70e9-4723-b5c4-8c82dc5ec5e6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "3673",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 584a6216a2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "2d618f80-4045-4951-8d2e-c8d33395a141",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:42 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index f328bac1ba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c9e48b82-1edc-4aa7-ac4d-c45c7bd4ae19",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:42 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 4137627685..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b346f588-dc55-4be6-95c8-e4708609a4e2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:43 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index b8a3a18fa7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a5650999-a5ad-4eea-b407-6d9913738f24",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:06:43 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 56db26d9b8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5e8c0572-8f87-4708-9aca-997ea3736bc4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:43 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index 84a774dd80..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "134576b2-43ed-40ac-aefb-c4770a81f587",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6407",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index e2bdf29eee..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 28,
-                            "minute": 6,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5daf9a13-6835-4e6d-be9f-040405da8dff",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6407",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 4f36504538..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "561b039d-ffee-42dc-a390-6dde1ae4fcfe",
-            "HTTPHeaders": {
-                "content-length": "990",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index ebd539e3a5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "29d88495-a6b4-4f53-9ec7-32ac21fd80c6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 9b004c2a97..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a647316d-7079-4a0a-8ad3-91a0a36dc124",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:51 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 9cf6f0ffc3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f913c208-ac39-4b8e-aba5-1410f2e4d6cf",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:05:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 88eeadf41a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "260f7ff4-ec3b-452e-90f3-9ffb3d5f6895",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:05:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 860dcfd331..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fb308284-ea47-44f9-af61-3c0271809839",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:05:39 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index d71b6108ec..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5e0c4efb-8f23-4ce1-b1fe-c5bccac45063",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:05:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 6ca0be0346..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "be516d5b-d999-4de7-bd3e-9c0cb5de857c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:09 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 633be4130c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/check_for_update_tags/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9c06e289\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.112.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>HxHFvA2bBdWo_sBRDHLiRCDviolMhaMR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.42</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.148.246.46</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.41</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>YANkpCz981zsiW_QkZCFrjN1QAiKm73G</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.112.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 36,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.148.246.46",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 57,
-                            "minute": 5,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "007948c6-bac8-4f43-8b80-5e7c32f2d1e8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:06:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index c7f4a8a970..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9006e285",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e312dbd3-7956-4b0e-bb66-29a85e65e477",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5233",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 933d986822..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fd2ddf0e-f378-46d7-92e7-1b6008d98b04",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 4c2a4f72bc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bcdba325-fd96-4c4b-bb15-dc9a88c456ae",
-            "HTTPHeaders": {
-                "content-length": "1917",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 25f9a24c45..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ee75ebe8-0587-49b5-a231-0d31f713e3be",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:55:39 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index fde1cd4c02..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5cbe30a2-8771-4116-ba7d-78c32a06546e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:55:55 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 3c37b32a2b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 56,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3d3d8178-0359-4c80-85c7-410411a532f4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index e13b27d041..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 56,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "67e4f285-2875-4615-ba4e-a36105d24dd7",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index beaa98a1c0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 56,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a31cc536-1f4b-46d7-a91d-c8d0909eb897",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index cf88d5b8d0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0cf4c8bf-4f69-4f9f-b6ae-aecbbcb60081",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 4803740289..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "07019e0f-0012-47dc-8f86-950bb2b36e52",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 5e69b0584d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8174c5d9-d54a-4173-aef3-5e9c3e86bac6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 47ad906096..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "46432541-20bd-444f-ab0a-38db7c36aab5",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:54:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index f7137760d3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "84598175-301b-40e4-884d-4e4777267375",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:54:21 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 69249db308..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "092fbf9c-c529-4f71-855e-20b4289dc6f4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:54:37 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index da6185154f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6d1bb01f-6afe-418c-94c2-7d83c4f94a4d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:54:52 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 284e8b5492..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "830ae224-6cdf-46e2-817b-92bcd5fa86ec",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:55:08 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 3f1a6a680f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9006e285\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.24.101.167</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>ZqeYNh0tOtKAbA2GjOnfP1ckplrsKR0I</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.126.9</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>2hNRbfughR8JKpllR1mEg0uPRckXd0bR</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.24.101.167",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 10,
-                            "minute": 55,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.126.9",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 34,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "51ec304a-3c90-4bbe-86dc-56d87d693ef6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:55:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 45abc72182..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9306e286",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "541d2997-d79d-42b4-af0a-7d49754a99a0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5235",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:14 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 46c92879a6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e9b91aeb-4237-44ba-9367-b9d240b3d8ba",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 5a1e79ea42..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fc165fe7-372e-4517-a256-5e12138aa890",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "2356",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:14 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 06d4d8371d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9e46eaa5-4f5b-42ff-ada0-d90504c0bd9c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:58:20 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index fc46769aff..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a3d938cd-ea4f-4739-87df-956db661c1a3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:58:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 0a7045f11e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c49c942f-0408-4d6d-b04a-1778dc3a3c43",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:58:52 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 385a832a5e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "18debff6-05c3-44ad-8106-1c1099fba0e0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index cb313c523c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6fb7285e-c4ff-4f11-bdbc-464efbb66f15",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index 4749c57d5d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "cffd1787-58a7-4506-b14b-0bab509b8a1a",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index de15a8f21d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "cb19e2ba-a42a-47d3-a20f-9ea9521978f4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:23 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 3328315102..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "de97618e-a5a7-4efd-925c-6ca24b2603c6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:59:24 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_18.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_18.json
deleted file mode 100644
index 505d1a36a5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_18.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "aa76261f-ab0e-4bd4-a412-a59e7fdfb6db",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_19.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_19.json
deleted file mode 100644
index caac14d220..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_19.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 58,
-                            "minute": 58,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 0,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9885231e-ee67-49cb-ada6-e8eb3c772e6b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 7e870bbe37..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ca30a295-dfce-49f8-a1d1-f5af0dffd1c2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:14 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_20.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_20.json
deleted file mode 100644
index 0f39c5aa63..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_20.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "204f247b-ad5a-4917-bc3e-a793bf09bd48",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 1af37e3057..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a8ebc328-fea9-430d-a546-c5e24d447cef",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index e8ab98030a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "edf29e1c-30a1-4d11-9e5a-feddd7f082ab",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:56:46 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 5e8203fec8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "51c5182c-f83e-496b-ba45-e4972064d690",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:57:01 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index cf06e0ad47..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b9255f48-f509-42a9-8c0f-6626a492b46e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:57:17 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index e7965bd025..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bab0deee-150b-4952-b949-4acefe6ebafe",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:57:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index e7c600455d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c90d25a2-7e6c-42cc-8f5a-17ab0c58e720",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:57:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 17bd7e7395..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/create_connection_that_exists/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9306e286\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.146</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.213.145.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.145</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>iNsKYUCSTSepYCf0igJVeirisatbjYiw</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.86</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.202.36</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.85</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>KZpfPULAV7ahI1aUspYf9oy4412BFNoP</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.213.145.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.202.36",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 15,
-                            "minute": 56,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b1da658d-a66a-4def-873f-193ede827765",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:58:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 21408b7a6d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9d06e288",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6b76950f-28f0-4e74-9b61-14780c62ced9",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index a27bc82cf9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e0e829b9-86e9-4b26-aa01-ccacf0a77edc",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:31 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index fc618a3241..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "149f4f23-9fec-4995-acc5-0db46d4d698f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "3234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 958e8a9821..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5bb89e85-8f96-43b1-96e3-0fd6c00f9b14",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:03:58 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 265a34962d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "40ebbb4a-0a18-494e-9666-3481637027fc",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:14 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 71caefcf58..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 19,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a86ec01a-5ea5-4fba-8123-5567a04a3596",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 037ba1a1d9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 19,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6c96cc41-2657-47a0-b437-a79b0631bbd8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 7e74e95fbe..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 19,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1f605613-e582-4b3b-8838-e9fcf0c58e67",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index 5bbb025be0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 19,
-                            "minute": 4,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9e38c8b0-f339-463a-b92f-aa90fd3315e8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:04:31 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 786f224ead..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0d2390b1-83fb-40f6-ab75-adf605a9a3fc",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:31 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 7abf137d37..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e29c19bc-d875-4b6b-83b2-bc2fdfb87bf0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index e7dc1a4a4f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "686ef8bb-a95e-4b86-b814-f272c54c8ea5",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:02:09 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 3e3f889f90..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c0583208-1fa5-4c6e-8970-8dd2f3ecd62d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:02:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 59d520d1c4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b10cdcbf-b16e-43c0-99b1-2fe2ad8db09b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:02:40 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 06ce44a44d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "93d3176a-6d6a-44de-8a20-91bd4a64b3a3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:02:56 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index e15dc61ebf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "329c10c9-0ee8-48d3-acb2-b48668ddbab6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:03:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 806c717d2f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bf983aa1-224e-470a-b0a1-add5bda488b5",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:03:27 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 8e7c3eccfb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_connection/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9d06e288\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.166.247.180</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>vMOOPmaOf_RaI5CYB1HP1LSN7fKVajOB</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.126</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.167.45.7</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.125</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>DP5uNzsBDGM2M79qOw0w4uttdQvvTmuE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.166.247.180",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 54,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.167.45.7",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 29,
-                            "minute": 3,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4857fe1d-dc96-4168-a7e1-9fbb73282ab2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:03:43 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_nonexistent_connection/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_nonexistent_connection/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index eebfb3a70b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/delete_nonexistent_connection/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8218208e-030d-4aea-9ae5-6e8534efe1ef",
-            "HTTPHeaders": {
-                "content-length": "243",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:04:32 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_1.json
deleted file mode 100644
index 9f4209eea0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ccf8e327-eeee-4db8-9ae6-006a8fe5628c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:48:04 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_2.json
deleted file mode 100644
index 062840fc21..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateTags_2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0e1859bf-b896-4a30-ab94-849441b914f9",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:48:05 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index c81bb5f509..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-6a06e27f",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5db2e287-2d09-4a50-aaa1-a4615ece9bd6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5235",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:03 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_2.json
deleted file mode 100644
index 69c39a89a8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.CreateVpnConnection_2.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-9e13c880",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9506e280",
-            "VpnGatewayId": "vgw-32d70c2c",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7533469a-5979-42fd-94de-c33a66d34065",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index cc17b12afc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5670f275-006d-48db-91e0-72058d9d881f",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_2.json
deleted file mode 100644
index d2fd5524e8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DeleteVpnConnection_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "35514550-20a7-4f91-b175-d21182ad8bdd",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index d9d2f28724..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "edae433c-c2f8-475a-95f9-5c3c00d0b54b",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:03 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index aeb3224679..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a30a934b-5716-4d4d-958a-7e780e333a24",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:08 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 3132117c7c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "99b8bb83-e3f0-4b87-9121-5d862e2627f0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 89a6fd077d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c6d1bf65-4f3e-4f7f-9274-281ebf433b2b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 6c50e6b66c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "28733dff-592e-4c48-94f9-b4d56bbc246a",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index c8ad595dcb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d38f939c-ded7-416b-a563-88161b71be1c",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index 06fd99e110..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "af7c54ed-ca7f-4013-adee-16133b822d53",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:26 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index ef0845944a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "24133f7b-2620-4f2b-98b5-427aaa5d04bd",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:41 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 1a5bc6e785..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5ac6d438-cae6-40cc-9c63-81073def54be",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:45:57 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_18.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_18.json
deleted file mode 100644
index 77dbba5bba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_18.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "968a8ebd-ed59-4a8d-a314-83a6430bebd3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:46:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_19.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_19.json
deleted file mode 100644
index 6c01e2c67f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_19.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "07f96ac8-f5ec-43e4-ab7d-6b989e071808",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:46:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 2f51af3710..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b1b10bb7-e85c-44ca-b74e-85352550db52",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:04 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_20.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_20.json
deleted file mode 100644
index 30ecbe4b4e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_20.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0750711f-fafd-4323-a685-65329a0a9302",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:46:43 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_21.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_21.json
deleted file mode 100644
index 844fdab041..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_21.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ec319bcc-2a61-43d3-a69c-9d94235aeb56",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:46:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_22.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_22.json
deleted file mode 100644
index be8c4aa55b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_22.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6fe5a339-9436-4077-a201-dab2b7b95039",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:47:16 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_23.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_23.json
deleted file mode 100644
index 0a98ebdf35..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_23.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7897be6a-fc15-4608-bac0-c3cf7bba28c6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:47:31 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_24.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_24.json
deleted file mode 100644
index d304915288..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_24.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 26,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "898cc57f-ab56-47d7-920e-995814f532a4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:47:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_25.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_25.json
deleted file mode 100644
index 79b0739f09..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_25.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "134c741c-757b-4a87-9a34-c8f1848ef33e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_26.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_26.json
deleted file mode 100644
index 49b4c09ab6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_26.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8009af6c-6d35-45fa-a94d-5384d3b92573",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_27.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_27.json
deleted file mode 100644
index 059a154eeb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_27.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7ef9e804-1eb9-4486-9285-584204a824a3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_28.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_28.json
deleted file mode 100644
index 76ad9ba8ec..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_28.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "05c178e1-3f1f-4e0f-bb43-027d2b41f56c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6561",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:04 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_29.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_29.json
deleted file mode 100644
index 0b2918289e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_29.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "92db5b5e-d7e6-4cfd-9d62-abdda5a6083c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:04 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 9f85a23b56..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "2a3a4fd7-189b-43b0-8a44-82ebd52dba01",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:19 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_30.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_30.json
deleted file mode 100644
index cad1188b97..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_30.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 6,
-                            "minute": 45,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ffa7e24d-e004-4b4e-9317-80b97dc89cc8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6288",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:04 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_31.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_31.json
deleted file mode 100644
index 94f87c7d06..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_31.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0cebf278-197b-4bdd-b8d9-c44250637154",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6559",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_32.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_32.json
deleted file mode 100644
index bba6206329..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_32.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4bc3a17b-6896-4f8a-b3bc-07cbbf88e9e2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:05 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_33.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_33.json
deleted file mode 100644
index 630ea016d7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_33.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7371d436-849d-4717-a284-e33389f8982d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6288",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_34.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_34.json
deleted file mode 100644
index a294fb7421..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_34.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9506e280\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.138</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.164.115.77</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.137</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>LOIUEOybh.7onRDbkA0jIjVgwAanpstb</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.14</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.32.43.175</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.13</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>gVdPYm2D00u04GU8PlcRg8NayCIB.8hu</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.164.115.77",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.32.43.175",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 49,
-                            "minute": 47,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b645a20e-3689-4a13-8af1-2dcc38f70a9b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6288",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_35.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_35.json
deleted file mode 100644
index 42ea2ec0db..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_35.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6e80e598-aeb2-4ae1-bfe3-2383505379cc",
-            "HTTPHeaders": {
-                "content-length": "871",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_36.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_36.json
deleted file mode 100644
index 9a97df1f0e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_36.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f4072f73-ff8c-49ed-89a7-eaed0389b11a",
-            "HTTPHeaders": {
-                "content-length": "873",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:08 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index ad74fa0620..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ed467717-f22a-4c33-a9e7-0f871d1b35b2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 9f2bb01f3f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "49f28398-4458-4c9d-9c04-598c9d8e76bd",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:50 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 58c773d2c0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bebb46be-76a1-486b-a9d0-7f0e33f68294",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:44:06 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index a15fd0e326..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "090f369a-71f4-4e60-b860-c1f5cc52a5ab",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:44:21 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 2765a9f26f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f98ad6e5-e3c6-48ae-b6c1-d9ed9824ea88",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:44:37 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 9b6e2ada23..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_filters/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6a06e27f\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.194</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.160.156</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.193</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oC1SMX2FbEbY71f2sWq3DPOQELqt4h0p</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.90</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.33.241.73</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.89</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>oNaPmhtWjtzz4Wy3TolB1e5C1UK6_6t9</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.160.156",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 4,
-                            "minute": 43,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.33.241.73",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 53,
-                            "minute": 44,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ef918599-de1c-40e5-95ab-2a4b16356455",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:44:52 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_1.json
deleted file mode 100644
index 52ca967311..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f39595f7-c4f7-4e7c-9681-83e5619e0d84",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:50:34 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_2.json
deleted file mode 100644
index 3aeb21cf6f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateTags_2.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "61647610-452d-4a99-abce-d8e61a6ada95",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:53:28 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 17aca9388e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9706e282",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "080cc661-516b-4d6c-806b-64f54b232f57",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5235",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_2.json
deleted file mode 100644
index 0080abe9dc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.CreateVpnConnection_2.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-9e13c880",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9606e283",
-            "VpnGatewayId": "vgw-32d70c2c",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d49ec118-3438-40cb-bcb5-8e98d9676688",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5236",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index ddce99bb1e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "995f99a1-42d4-4d0f-b216-5e54c7052a71",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_2.json
deleted file mode 100644
index 65af7a3666..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DeleteVpnConnection_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "701a2c53-ef2e-4b77-bb0c-b0e4904dc714",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 59bbeec791..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "22e251ed-4e2b-49a4-8747-fcc9c39ad99e",
-            "HTTPHeaders": {
-                "content-length": "1310",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 334a32fc44..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 9,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "66c5b212-f514-4075-ab41-6c70424d13ef",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:17 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 27cf0e60f4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 9,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4fa0db43-456e-491d-a6f6-2a2a262bc068",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 12afe81e0d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 9,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "521f0a1b-e935-40c2-b896-b13b5b6f2d1a",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:34 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 0c5d8ca784..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 9,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "da5b58d2-4042-4ed5-8faf-daceb3d706c6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6290",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 861ebd74b5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d4e21661-391e-48b9-80f8-6c04a13a653e",
-            "HTTPHeaders": {
-                "content-length": "1312",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:35 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index d54c65027c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3b4a1671-80a6-45a7-b620-885f88f5fd77",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 41fc9a238f..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "55115858-ebfd-4329-85e8-5bd15b31e62d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:51 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 1d82c71110..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "241b82e1-4611-495a-952d-21fce8354e6e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:51:07 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_18.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_18.json
deleted file mode 100644
index 0b0861b689..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_18.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "898fcbc8-4c89-49cd-943f-7c2f0e3a73b7",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:51:22 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_19.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_19.json
deleted file mode 100644
index c054486c7a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_19.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "2f8be95a-d488-412c-9bc3-bca1c66c3ccf",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:51:38 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 9900b9b0a8..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bd0e67d4-f5a5-4e98-a388-e80af982bebf",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_20.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_20.json
deleted file mode 100644
index 39ddd25ed7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_20.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "66fe299d-2a18-4693-bdc3-00475c529a7f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:51:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_21.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_21.json
deleted file mode 100644
index cd711acfe3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_21.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b5ebc50e-0f1d-4d96-87c1-bf222c186911",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:52:09 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_22.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_22.json
deleted file mode 100644
index 490f336b65..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_22.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4f123753-f797-4aff-83f2-edfdb31b679f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:52:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_23.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_23.json
deleted file mode 100644
index 78223c6e99..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_23.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ff8ad5d4-4798-44f2-b89a-100387a1e1bc",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:52:40 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_24.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_24.json
deleted file mode 100644
index 2a98e20698..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_24.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c69b6d28-6925-4b09-9a23-c58bd23a952d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:52:56 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_25.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_25.json
deleted file mode 100644
index 069b679c24..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_25.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 36,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "30239673-06bd-4122-8187-834e098e3035",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:12 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_26.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_26.json
deleted file mode 100644
index 95f632a833..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_26.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 14,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a35493d8-79cf-44ce-a5d9-a322984952bb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:27 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_27.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_27.json
deleted file mode 100644
index f3e3744186..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_27.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 14,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a0d807f4-6947-474e-86bc-f1d978a1e6c6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:27 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_28.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_28.json
deleted file mode 100644
index 0eb348b26b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_28.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 14,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "123f065b-f06a-4464-93e9-f0c9224825dc",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6290",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_29.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_29.json
deleted file mode 100644
index 15182c9cab..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_29.json
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9606e283\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.142</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.215.4.190</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.141</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>l9lo.f40_7mQk6G.Xe1tZ3HnYaGrqeis</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.214</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.163.123.41</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.213</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>By_kbJfKdll6PTY4W.pMr7CC0gqeP5U2</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.215.4.190",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 41,
-                            "minute": 52,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.163.123.41",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 14,
-                            "minute": 53,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 9,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c6c78a9a-e004-4766-8ef6-16c52b25475d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 12:53:28 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index fb9619cdcd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "2b96bd10-97eb-44b0-9ab9-548b0ddf03b9",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_30.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_30.json
deleted file mode 100644
index 4dd608bc64..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_30.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1b613de0-c6e1-48d3-9c9d-b94de070ccda",
-            "HTTPHeaders": {
-                "content-length": "873",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_31.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_31.json
deleted file mode 100644
index 6e537944b5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_31.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0e36b69f-39b7-40ac-8273-8003211fc5f5",
-            "HTTPHeaders": {
-                "content-length": "873",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 4a13f61e8c..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ace0b6a9-e76f-4198-a077-1e2dffbc6c2e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:43 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 3695e62250..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "434a478c-99ab-4da1-9446-0190d615553f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:48:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 337959a798..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "406c570c-4ca9-4657-aab6-c3aec6943a24",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:49:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index 171cce6579..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bc262f2c-187c-45ff-bd0e-b8287760d26e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:49:31 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 9b63c6f5f0..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "99bc2889-52c9-4933-ba37-9fc2524a6ec1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:49:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index a647284910..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_insufficient_filters/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9706e282\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.26</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>34.214.254.212</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.25</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>AwW2EGlLGc4apzToCgrKQ2e4RexOSfj8</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.174</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.38.34.113</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.173</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>5Slu8XDI5h2_TGXkCw_E2wAiRzyz3yIn</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "34.214.254.212",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 1,
-                            "minute": 50,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.38.34.113",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 48,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "26fd3e6c-8c41-4e3b-8bda-47ee9b1ef167",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:50:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_nonexistent/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_nonexistent/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 288d2313bc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_nonexistent/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9606e283",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-9506e280",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "79832782-f6e3-483a-b848-306c43731940",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "2087",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:53:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 90b1f2dd20..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-6f06e27a",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ef16cc59-db82-49e8-b39f-5ed5035a6fba",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5236",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_2.json
deleted file mode 100644
index dbb692fb60..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.CreateVpnConnection_2.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-9e13c880",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-6906e27c",
-            "VpnGatewayId": "vgw-32d70c2c",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7311c482-6425-4bf5-b764-06652c9ea4b8",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5232",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:37 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 7d346168ad..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "73286a1c-f428-4617-9b23-b0af8e8e2657",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_2.json
deleted file mode 100644
index cde1d02377..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DeleteVpnConnection_2.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6ff1e7ac-f41b-45f8-a925-99f12f15df72",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 079fe193fc..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "784ab580-8495-4cff-b8a9-a70474686d99",
-            "HTTPHeaders": {
-                "content-length": "243",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 5a14e8385b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "45a3a55f-4577-4292-9c88-6b20c8968bdb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:39:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index d70a4c405e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "dea0cb15-a87a-4340-836d-6cd460b2243e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:39:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index 731805d6b9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c9f63be4-079d-4dcd-adb8-ab18f8787a9c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:39:48 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index b7406b64cb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "75e6bdc7-dab7-428c-900b-f8566fcdd8b4",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:04 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index a5f05224ef..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "02cad910-6d43-4d55-a031-4055a30bf411",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:20 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index f663512223..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 25,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "18e05aff-5c66-4e73-97bd-a63061019ed2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 53623b87b3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 25,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "6df83c0e-40bd-41ed-8149-960375e0b0cf",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_17.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_17.json
deleted file mode 100644
index 62f01fc341..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_17.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 25,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a6f596eb-c6a8-4e31-8e1a-bc1ae80443c5",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:36 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_18.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_18.json
deleted file mode 100644
index 2336ab51cb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_18.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "dde896f2-98ea-45d2-8208-b71b46a88cd7",
-            "HTTPHeaders": {
-                "content-length": "243",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:37 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_19.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_19.json
deleted file mode 100644
index 3741da6497..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_19.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "22bd50ce-bac1-4b63-bef5-d91e10a27cb6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:38 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 7552a17aae..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "acad86c4-655b-488f-a552-f04c60502dcb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_20.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_20.json
deleted file mode 100644
index 448959205d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_20.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4df8324c-5d9f-436e-b9c8-31d123170bcd",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:40:53 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_21.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_21.json
deleted file mode 100644
index fcfe29941d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_21.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "b2fddbbe-070c-40c4-b3ff-31b4ab039a93",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:41:09 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_22.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_22.json
deleted file mode 100644
index 819d4fb183..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_22.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e4575384-f0ae-4ddb-a6f0-60bf09ae3431",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:41:24 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_23.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_23.json
deleted file mode 100644
index f7b5de10de..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_23.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3c2df2d8-21ff-435b-a25e-309708e5d728",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:41:40 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_24.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_24.json
deleted file mode 100644
index d2b789983e..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_24.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "47bedfce-6c4f-40e5-8d3c-2f7618670665",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:41:55 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_25.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_25.json
deleted file mode 100644
index bf69c4d579..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_25.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "25fb78ea-cc25-427c-a1bb-c9bc06a0fcf0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:11 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_26.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_26.json
deleted file mode 100644
index 005ca53be1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_26.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "dfd25f0b-3331-46b0-9594-739e54b3633b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:27 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_27.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_27.json
deleted file mode 100644
index a8dc687f13..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_27.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 31,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 37,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e0ce84a4-b7fa-4c51-89c5-f689f5ab05e7",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6116",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:42 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_28.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_28.json
deleted file mode 100644
index 207caacdcf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_28.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 31,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 46,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fbb5d0bf-db4a-4865-b74a-15c9d5dc9acb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:58 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_29.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_29.json
deleted file mode 100644
index 397ea49ca3..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_29.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 31,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 46,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "06310935-6410-44da-ab8a-0a3a77b2ed02",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 6c2a473a76..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bc0abc0d-3217-4a9c-91b7-4cf7d1612270",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:29 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_30.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_30.json
deleted file mode 100644
index 86a37a4779..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_30.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6906e27c\">\n  <customer_gateway_id>cgw-9e13c880</customer_gateway_id>\n  <vpn_gateway_id>vgw-32d70c2c</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.78</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.40.19.84</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.77</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>uckHBwcFkdkno4gf5nZHDLCNIM7WXFaW</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>5.4.3.2</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.46</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>54.149.194.122</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.45</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hyFjiPPXAKg6WDjLQkfT7be6lPSK1.TE</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.40.19.84",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 31,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "54.149.194.122",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 46,
-                            "minute": 42,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5ce492e4-a36b-4148-9db4-1cd1390f4d94",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:42:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_31.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_31.json
deleted file mode 100644
index c5d67fffc9..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_31.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 25,
-                            "minute": 40,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 39,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fab3e62a-b821-40cc-ac9d-3b589ddd7be9",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6124",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_32.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_32.json
deleted file mode 100644
index 66db65f6bf..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_32.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c45356e9-b255-4886-bdeb-a200225b3066",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_33.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_33.json
deleted file mode 100644
index 0abc817174..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_33.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-9e13c880",
-                "VpnConnectionId": "vpn-6906e27c",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-32d70c2c",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "39d1181a-5c5b-4d7e-97cd-dcd5b83bc0b3",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:43:00 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 2c4135812d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ed7c7fbb-b31b-4244-b588-e90821e65bff",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:45 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 6434571b26..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "096fa68d-3ed3-4483-b323-4b03cc2c1ebd",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:37:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 5e30b888c1..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e18b7cde-2baa-466e-a5ac-ac5cd94db089",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:38:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index c84d4c084d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5845f7f3-a0ea-4948-b3ee-d9ee3fc0f303",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:38:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 3b729eccb5..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4a29bfaa-c800-4ed7-858c-9ea4fc8de167",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:38:47 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 87dd4df8e4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/find_connection_vpc_conn_id/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-6f06e27a\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.34</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.161.239.138</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.33</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>XGAHy.QMOtIujnLKHvwNdGivflNQGbxc</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.230</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.108.105</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.229</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>hk9hgD21aBIIJSz4809scBxMT3dsX_0h</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.161.239.138",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.108.105",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 13,
-                            "minute": 37,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "8c873704-b869-4dc2-890d-ebc7d62d7963",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:39:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index 1262491d43..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9206e287",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "686913e8-485a-4de0-880d-60a0c2444f65",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5235",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 2f8b7802e6..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ba0807f4-446e-471b-ad25-dc627d0917ff",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 3fe09832d7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e85e108f-c5c6-4627-a409-ae5e57519e68",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "2795",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index 5726948840..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 32,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "fe0912ad-2a87-4f24-a2e9-ecce88edd3a6",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:33 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index c1593d62e4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 32,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "3d9c0acf-a5e7-41cf-a929-17a804c23cf1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index f1d5f5b426..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 32,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c59001df-f7a6-413d-8ba2-a3a3e1f3a08c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 686dfef842..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 32,
-                            "minute": 1,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f9a5a6a9-a952-4183-8600-f0d709ca5902",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:49 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 5a65e1dcb4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ad7f2a01-f5a2-41cb-b572-e55cfff6f0fd",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:50 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index b2bbc32a63..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "ffd0c558-1fb0-4e47-8a78-ad93241a8909",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:50 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index 4ce279f36d..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "aefdae0c-715c-468d-b209-df744593d702",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index a2d6c448ba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5e7d2b85-1951-4fa5-8003-dcae818ab111",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 9075e75e64..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "648be063-6a5d-4871-8ccf-047275662818",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 12:59:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index ba6c47c51a..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "e5f1a740-ef05-454b-a8ce-26c6c96d6822",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:00:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index 089a0a1697..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "240aa4a8-495f-4e22-973a-d1b8ca85a7b7",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:00:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index a93c555c8b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "71e9943b-886d-442f-bd0d-eb50d92522e2",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:00:46 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index ca810951ba..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "518172bc-6355-4988-8a92-14c589fbfc6f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 2af22bb65b..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/modify_deleted_connection/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9206e287\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.206</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.26.213.112</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.13.205</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>PyWmFHtlfQSgohtXYC1MXVSE9i80QMOK</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.226</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.36.80.33</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.14.225</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>K_tnJM.Z5LxS.Y6vpeXIaCLdetEZik__</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.26.213.112",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.36.80.33",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 12,
-                            "second": 28,
-                            "minute": 59,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4679b3c8-f187-4207-81fc-79982e721cb0",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6118",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:01:18 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.CreateVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.CreateVpnConnection_1.json
deleted file mode 100644
index f278854b92..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.CreateVpnConnection_1.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "data": {
-        "VpnConnection": {
-            "CustomerGatewayId": "cgw-6113c87f",
-            "Options": {
-                "StaticRoutesOnly": true
-            },
-            "Category": "VPN",
-            "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-            "Routes": [],
-            "VpnConnectionId": "vpn-9806e28d",
-            "VpnGatewayId": "vgw-35d70c2b",
-            "State": "pending"
-        },
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f5a54fbe-aabf-4b5e-82f6-0fc9cd13e50c",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5234",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteTags_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteTags_1.json
deleted file mode 100644
index bf0afd35e4..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteTags_1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "2714ec51-d05e-4034-8401-2c99f5247755",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:15:02 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteVpnConnection_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteVpnConnection_1.json
deleted file mode 100644
index 5cdff416eb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DeleteVpnConnection_1.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "data": {
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d635286c-b0e0-4048-9edd-5370c643aab4",
-            "HTTPHeaders": {
-                "content-length": "239",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:03 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_1.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_1.json
deleted file mode 100644
index 0e552275c2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_1.json
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "0a7676c6-68de-4301-b107-5ef0fcf5136e",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "5448",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:25 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_10.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_10.json
deleted file mode 100644
index f5afd3ed16..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_10.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "68efe4ef-9c50-414b-bd65-cbf418c25f72",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:14:30 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_11.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_11.json
deleted file mode 100644
index 56c742fafe..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_11.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 38,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7b7f58cb-4e94-4cb2-9d93-ad6e82949476",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:14:46 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_12.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_12.json
deleted file mode 100644
index fd2890b7ef..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_12.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 38,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "1d06bb9d-234a-43b4-9465-0f0d6769e7cb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:01 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_13.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_13.json
deleted file mode 100644
index 18c7b173fe..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_13.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 38,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d967fe54-4131-4d3c-8bec-ca51039d51f5",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:01 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_14.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_14.json
deleted file mode 100644
index 3373af1da7..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_14.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 38,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "9bdf35c6-373f-4a9f-a86a-4f01cd15f742",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6122",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:02 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_15.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_15.json
deleted file mode 100644
index bfe18c0374..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_15.json
+++ /dev/null
@@ -1,214 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 38,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 16,
-                            "minute": 14,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "available"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9e06e28b",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Ansible-Test",
-                        "Value": "VPN"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9f06e28a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9c06e289",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "One",
-                        "Value": "one"
-                    },
-                    {
-                        "Key": "Two",
-                        "Value": "two"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9d06e288",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9206e287",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9306e286",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9006e285",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9706e282",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Correct",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6a06e27f",
-                "Category": "VPN",
-                "Tags": [
-                    {
-                        "Key": "Wrong",
-                        "Value": "Tag"
-                    }
-                ],
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            },
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-6f06e27a",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "bcdce0f0-10da-4e78-8fbe-ac147d62013b",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-type": "text/xml;charset=UTF-8",
-                "server": "AmazonEC2",
-                "date": "Mon, 16 Apr 2018 13:15:02 GMT",
-                "transfer-encoding": "chunked"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_16.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_16.json
deleted file mode 100644
index 1e44c3c514..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_16.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "deleted"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "4d572583-1b0c-431f-a9f9-7acd45d588e8",
-            "HTTPHeaders": {
-                "content-length": "705",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:15:03 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_2.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_2.json
deleted file mode 100644
index d337c7f693..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_2.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "c8f872e5-ef0e-4517-8ab8-9ef0788a04bc",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:26 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_3.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_3.json
deleted file mode 100644
index 1d65fb2c68..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_3.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "d99d51ce-6b82-4f53-ade0-d4967b769c93",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:41 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_4.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_4.json
deleted file mode 100644
index 3c63747c06..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_4.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f43f34f0-e4d7-4888-9037-2d3f99a30f8f",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:12:57 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_5.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_5.json
deleted file mode 100644
index 4b1ed8e7fd..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_5.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "5b03354b-e15d-4cb7-92e3-b359870a99a3",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:13:13 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_6.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_6.json
deleted file mode 100644
index f10651beff..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_6.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "a022a838-4264-4f08-b309-bea8058706ae",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:13:28 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_7.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_7.json
deleted file mode 100644
index 6f5406b365..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_7.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "f9ae9cd9-ce79-4245-863b-79fd5b39cdc1",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:13:44 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_8.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_8.json
deleted file mode 100644
index 25e0713fdb..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_8.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "57806378-a669-45b1-96ec-ab29ae8a47bb",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:13:59 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_9.json b/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_9.json
deleted file mode 100644
index 98f25682a2..0000000000
--- a/test/units/modules/cloud/amazon/placebo_recordings/ec2_vpc_vpn/remove_tags/ec2.DescribeVpnConnections_9.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "data": {
-        "VpnConnections": [
-            {
-                "CustomerGatewayId": "cgw-6113c87f",
-                "VpnConnectionId": "vpn-9806e28d",
-                "Category": "VPN",
-                "CustomerGatewayConfiguration": "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<vpn_connection id=\"vpn-9806e28d\">\n  <customer_gateway_id>cgw-6113c87f</customer_gateway_id>\n  <vpn_gateway_id>vgw-35d70c2b</vpn_gateway_id>\n  <vpn_connection_type>ipsec.1</vpn_connection_type>\n  <vpn_connection_attributes>NoBGPVPNConnection</vpn_connection_attributes>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.22</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>35.165.156.252</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.12.21</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>z2x1x6uE.UaqsFoLbfNuGIzp0rZTLiT.</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n  <ipsec_tunnel>\n    <customer_gateway>\n      <tunnel_outside_address>\n        <ip_address>9.8.7.6</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.58</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </customer_gateway>\n    <vpn_gateway>\n      <tunnel_outside_address>\n        <ip_address>52.39.145.205</ip_address>\n      </tunnel_outside_address>\n      <tunnel_inside_address>\n        <ip_address>169.254.15.57</ip_address>\n        <network_mask>255.255.255.252</network_mask>\n        <network_cidr>30</network_cidr>\n      </tunnel_inside_address>\n    </vpn_gateway>\n    <ike>\n      <authentication_protocol>sha1</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>28800</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>main</mode>\n      <pre_shared_key>dsNLWo6G.KUBY99TYvBnEMohghrqm6.k</pre_shared_key>\n    </ike>\n    <ipsec>\n      <protocol>esp</protocol>\n      <authentication_protocol>hmac-sha1-96</authentication_protocol>\n      <encryption_protocol>aes-128-cbc</encryption_protocol>\n      <lifetime>3600</lifetime>\n      <perfect_forward_secrecy>group2</perfect_forward_secrecy>\n      <mode>tunnel</mode>\n      <clear_df_bit>true</clear_df_bit>\n      <fragmentation_before_encryption>true</fragmentation_before_encryption>\n      <tcp_mss_adjustment>1379</tcp_mss_adjustment>\n      <dead_peer_detection>\n        <interval>10</interval>\n        <retries>3</retries>\n      </dead_peer_detection>\n    </ipsec>\n  </ipsec_tunnel>\n</vpn_connection>",
-                "Routes": [],
-                "Options": {
-                    "StaticRoutesOnly": true
-                },
-                "Type": "ipsec.1",
-                "VgwTelemetry": [
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "35.165.156.252",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    },
-                    {
-                        "StatusMessage": "",
-                        "Status": "DOWN",
-                        "OutsideIpAddress": "52.39.145.205",
-                        "AcceptedRouteCount": 0,
-                        "LastStatusChange": {
-                            "year": 2018,
-                            "hour": 13,
-                            "second": 26,
-                            "minute": 12,
-                            "__class__": "datetime",
-                            "day": 16,
-                            "month": 4,
-                            "microsecond": 0
-                        }
-                    }
-                ],
-                "VpnGatewayId": "vgw-35d70c2b",
-                "State": "pending"
-            }
-        ],
-        "ResponseMetadata": {
-            "HTTPStatusCode": 200,
-            "RequestId": "7efaeb2a-f071-4178-af9c-1bcdbb383d0d",
-            "HTTPHeaders": {
-                "vary": "Accept-Encoding",
-                "content-length": "6120",
-                "server": "AmazonEC2",
-                "content-type": "text/xml;charset=UTF-8",
-                "date": "Mon, 16 Apr 2018 13:14:15 GMT"
-            },
-            "RetryAttempts": 0
-        }
-    },
-    "status_code": 200
-}
\ No newline at end of file
diff --git a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_FileSystems.py b/test/units/modules/cloud/amazon/test_aws_netapp_cvs_FileSystems.py
deleted file mode 100644
index 65d824b560..0000000000
--- a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_FileSystems.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# (c) 2019, NetApp, Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-''' unit tests ONTAP Ansible module: aws_netapp_cvs_FileSystems'''
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-import json
-import pytest
-
-from units.compat import unittest
-from units.compat.mock import patch, Mock
-from ansible.module_utils import basic
-from ansible.module_utils._text import to_bytes
-from requests import Response
-from ansible.modules.cloud.amazon.aws_netapp_cvs_FileSystems \
-    import AwsCvsNetappFileSystem as fileSystem_module
-
-
-def set_module_args(args):
-    """prepare arguments so that they will be picked up during module creation"""
-    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
-    basic._ANSIBLE_ARGS = to_bytes(args)  # pylint: disable=protected-access
-
-
-class AnsibleExitJson(Exception):
-    """Exception class to be raised by module.exit_json and caught by the test case"""
-    pass
-
-
-class AnsibleFailJson(Exception):
-    """Exception class to be raised by module.fail_json and caught by the test case"""
-    pass
-
-
-def exit_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over exit_json; package return data into an exception"""
-    if 'changed' not in kwargs:
-        kwargs['changed'] = False
-    raise AnsibleExitJson(kwargs)
-
-
-def fail_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over fail_json; package return data into an exception"""
-    kwargs['failed'] = True
-    raise AnsibleFailJson(kwargs)
-
-
-class TestMyModule(unittest.TestCase):
-    ''' a group of related Unit Tests '''
-
-    def setUp(self):
-        self.mock_module_helper = patch.multiple(basic.AnsibleModule,
-                                                 exit_json=exit_json,
-                                                 fail_json=fail_json)
-        self.mock_module_helper.start()
-        self.addCleanup(self.mock_module_helper.stop)
-
-    def set_default_args_fail_check(self):
-        return dict({
-            'creationToken': 'TestFilesystem',
-            'region': 'us-east-1',
-            'quotaInBytes': 3424,
-            'serviceLevel': 'standard',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_default_args_pass_check(self):
-        return dict({
-            'state': 'present',
-            'creationToken': 'TestFilesystem',
-            'region': 'us-east-1',
-            'quotaInBytes': 3424,
-            'serviceLevel': 'standard',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_create_aws_netapp_cvs_filesystems(self):
-        return dict({
-            'state': 'present',
-            'creationToken': 'TestFilesystem',
-            'region': 'us-east-1',
-            'quotaInBytes': 3424,
-            'serviceLevel': 'standard',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_delete_aws_netapp_cvs_filesystems(self):
-        return dict({
-            'state': 'absent',
-            'creationToken': 'TestFilesystem',
-            'region': 'us-east-1',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def test_module_fail_when_required_args_missing(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleFailJson) as exc:
-            set_module_args(self.set_default_args_fail_check())
-            fileSystem_module()
-        print('Info: test_module_fail_when_required_args_missing: %s' % exc.value.args[0]['msg'])
-
-    def test_module_fail_when_required_args_present(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleExitJson) as exc:
-            set_module_args(self.set_default_args_pass_check())
-            fileSystem_module()
-            exit_json(changed=True, msg="Induced arguments check")
-        print('Info: test_module_fail_when_required_args_present: %s' % exc.value.args[0]['msg'])
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_FileSystems.AwsCvsNetappFileSystem.get_filesystemId')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.get_state')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.post')
-    def test_create_aws_netapp_cvs_snapshots_pass(self, get_post_api, get_state_api, get_filesystemId):
-        set_module_args(self.set_args_create_aws_netapp_cvs_filesystems())
-        my_obj = fileSystem_module()
-        get_filesystemId.return_value = None
-        get_state_api.return_value = 'done'
-        response = {'jobs': [{'jobId': 'dummy'}]}
-        get_post_api.return_value = response, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_filesystem_pass: %s' % repr(exc.value.args[0]))
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_FileSystems.AwsCvsNetappFileSystem.get_filesystemId')
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_FileSystems.AwsCvsNetappFileSystem.get_filesystem')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.get_state')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.delete')
-    def test_delete_aws_netapp_cvs_snapshots_pass(self, get_post_api, get_state_api, get_filesystem, get_filesystemId):
-        set_module_args(self.set_args_delete_aws_netapp_cvs_filesystems())
-        my_obj = fileSystem_module()
-        get_filesystemId.return_value = '432-432-532423-4232'
-        get_filesystem.return_value = 'dummy'
-        get_state_api.return_value = 'done'
-        response = {'jobs': [{'jobId': 'dummy'}]}
-        get_post_api.return_value = response, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_filesyste_pass: %s' % repr(exc.value.args[0]))
-        assert exc.value.args[0]['changed']
diff --git a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_active_directory.py b/test/units/modules/cloud/amazon/test_aws_netapp_cvs_active_directory.py
deleted file mode 100644
index bc420d566c..0000000000
--- a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_active_directory.py
+++ /dev/null
@@ -1,124 +0,0 @@
-# (c) 2019, NetApp, Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-''' unit tests ONTAP Ansible module: '''
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-import json
-import pytest
-
-from units.compat import unittest
-from units.compat.mock import patch, Mock
-from ansible.module_utils import basic
-from ansible.module_utils._text import to_bytes
-from requests import Response
-
-
-from ansible.module_utils.netapp import AwsCvsRestAPI
-from ansible.modules.cloud.amazon.aws_netapp_cvs_active_directory \
-    import AwsCvsNetappActiveDir as ad_module
-
-
-def set_module_args(args):
-    """prepare arguments so that they will be picked up during module creation"""
-    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
-    basic._ANSIBLE_ARGS = to_bytes(args)  # pylint: disable=protected-access
-
-
-class AnsibleExitJson(Exception):
-    """Exception class to be raised by module.exit_json and caught by the test case"""
-    pass
-
-
-class AnsibleFailJson(Exception):
-    """Exception class to be raised by module.fail_json and caught by the test case"""
-    pass
-
-
-def exit_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over exit_json; package return data into an exception"""
-    if 'changed' not in kwargs:
-        kwargs['changed'] = False
-    raise AnsibleExitJson(kwargs)
-
-
-def fail_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over fail_json; package return data into an exception"""
-    kwargs['failed'] = True
-    raise AnsibleFailJson(kwargs)
-
-
-class TestMyModule(unittest.TestCase):
-    ''' a group of related Unit Tests '''
-
-    def setUp(self):
-        self.mock_module_helper = patch.multiple(basic.AnsibleModule,
-                                                 exit_json=exit_json,
-                                                 fail_json=fail_json)
-        self.mock_module_helper.start()
-        self.addCleanup(self.mock_module_helper.stop)
-
-    def set_default_args_fail_check(self):
-        return dict({
-            'state': 'present',
-            'DNS': '101.102.103.123',
-            'domain': 'mydomain.com',
-            'password': 'netapp1!',
-            'username': 'myuser',
-            'api_url': 'myapiurl.com',
-            'secret_key': 'mysecretkey',
-            'api_key': 'myapikey'
-        })
-
-    def set_default_args_pass_check(self):
-        return dict({
-            'state': 'present',
-            'DNS': '101.102.103.123',
-            'domain': 'mydomain.com',
-            'password': 'netapp1!',
-            'region': 'us-east-1',
-            'netBIOS': 'testing',
-            'username': 'myuser',
-            'api_url': 'myapiurl.com',
-            'secret_key': 'mysecretkey',
-            'api_key': 'myapikey'
-        })
-
-    def test_module_fail_when_required_args_missing(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleFailJson) as exc:
-            set_module_args(self.set_default_args_fail_check())
-            ad_module()
-        print('Info: %s' % exc.value.args[0]['msg'])
-
-    def test_module_fail_when_required_args_present(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleExitJson) as exc:
-            set_module_args(self.set_default_args_pass_check())
-            ad_module()
-            exit_json(changed=True, msg="TestCase Fail when required ars are present")
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_active_directory.AwsCvsNetappActiveDir.get_activedirectoryId')
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_active_directory.AwsCvsNetappActiveDir.get_activedirectory')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.post')
-    def test_create_aws_netapp_cvs_activedir(self, get_post_api, get_aws_api, get_ad_id):
-        set_module_args(self.set_default_args_pass_check())
-        my_obj = ad_module()
-        my_ad = {
-            'region': 'us-east-1',
-            'DNS': '101.102.103.123',
-            'domain': 'mydomain.com',
-            'password': 'netapp1!',
-            'netBIOS': 'testing',
-            'username': 'myuser'
-        }
-
-        get_aws_api.return_value = None
-        get_post_api.return_value = None, None
-        get_ad_id.return_value = "123"
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_active_directory: %s' % repr(exc.value))
-        assert exc.value.args[0]['changed']
diff --git a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_pool.py b/test/units/modules/cloud/amazon/test_aws_netapp_cvs_pool.py
deleted file mode 100644
index 5530916187..0000000000
--- a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_pool.py
+++ /dev/null
@@ -1,263 +0,0 @@
-# (c) 2019, NetApp, Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-''' Unit tests for AWS Cloud Volumes Services - Manage Pools '''
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-import json
-import pytest
-
-from units.compat import unittest
-from units.compat.mock import patch, Mock
-from ansible.module_utils import basic
-from ansible.module_utils._text import to_bytes
-from requests import Response
-from ansible.modules.cloud.amazon.aws_netapp_cvs_pool \
-    import NetAppAWSCVS as pool_module
-
-
-def set_module_args(args):
-    """prepare arguments so that they will be picked up during module creation"""
-    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
-    basic._ANSIBLE_ARGS = to_bytes(args)  # pylint: disable=protected-access
-
-
-class AnsibleExitJson(Exception):
-    """Exception class to be raised by module.exit_json and caught by the test case"""
-    pass
-
-
-class AnsibleFailJson(Exception):
-    """Exception class to be raised by module.fail_json and caught by the test case"""
-    pass
-
-
-def exit_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over exit_json; package return data into an exception"""
-    if 'changed' not in kwargs:
-        kwargs['changed'] = False
-    raise AnsibleExitJson(kwargs)
-
-
-def fail_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over fail_json; package return data into an exception"""
-    kwargs['failed'] = True
-    raise AnsibleFailJson(kwargs)
-
-
-class TestMyModule(unittest.TestCase):
-    ''' a group of related Unit Tests '''
-
-    def setUp(self):
-        self.mock_module_helper = patch.multiple(basic.AnsibleModule,
-                                                 exit_json=exit_json,
-                                                 fail_json=fail_json)
-        self.mock_module_helper.start()
-        self.addCleanup(self.mock_module_helper.stop)
-
-    def set_default_args_fail_check(self):
-        return dict({
-            'from_name': 'TestPoolAA',
-            'name': 'TestPoolAA_new',
-            'serviceLevel': 'standard',
-            'sizeInBytes': 4000000000000,
-            'vendorID': 'ansiblePoolTestVendorA',
-            'region': 'us-east-1',
-            'api_url': 'hostname.invalid',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_default_args_pass_check(self):
-        return dict({
-            'state': 'present',
-            'from_name': 'TestPoolAA',
-            'name': 'TestPoolAA_new',
-            'serviceLevel': 'standard',
-            'sizeInBytes': 4000000000000,
-            'vendorID': 'ansiblePoolTestVendorA',
-            'region': 'us-east-1',
-            'api_url': 'hostname.invalid',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_create_aws_netapp_cvs_pool(self):
-        return dict({
-            'state': 'present',
-            'name': 'TestPoolAA',
-            'serviceLevel': 'standard',
-            'sizeInBytes': 4000000000000,
-            'vendorID': 'ansiblePoolTestVendorA',
-            'region': 'us-east-1',
-            'api_url': 'hostname.invalid',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_update_aws_netapp_cvs_pool(self):
-        return dict({
-            'state': 'present',
-            'from_name': 'TestPoolAA',
-            'name': 'TestPoolAA_new',
-            'serviceLevel': 'standard',
-            'sizeInBytes': 4000000000000,
-            'vendorID': 'ansiblePoolTestVendorA',
-            'region': 'us-east-1',
-            'api_url': 'hostname.invalid',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_delete_aws_netapp_cvs_pool(self):
-        return dict({
-            'state': 'absent',
-            'name': 'TestPoolAA',
-            'region': 'us-east-1',
-            'api_url': 'hostname.invalid',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def test_module_fail_when_required_args_missing(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleFailJson) as exc:
-            set_module_args(self.set_default_args_fail_check())
-            pool_module()
-        print('Info: test_module_fail_when_required_args_missing: %s' % exc.value.args[0]['msg'])
-
-    def test_module_pass_when_required_args_present(self):
-        ''' required arguments are present '''
-        with pytest.raises(AnsibleExitJson) as exc:
-            set_module_args(self.set_default_args_pass_check())
-            pool_module()
-            exit_json(changed=True, msg="Induced arguments check")
-        print('Info: test_module_pass_when_required_args_present: %s' % exc.value.args[0]['msg'])
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.put')
-    def test_update_aws_netapp_cvs_pool_pass(self, get_put_api, get_aws_api):
-        set_module_args(self.set_args_update_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_aws_api.return_value = my_pool
-        get_put_api.return_value = my_pool, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_update_aws_netapp_cvs_pool_pass: %s' % repr(exc.value))
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.put')
-    def test_update_aws_netapp_cvs_pool_fail(self, get_put_api, get_aws_api):
-        set_module_args(self.set_args_update_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_put_api.return_value = my_pool, "Error"
-        get_aws_api.return_value = my_pool
-        with pytest.raises(AnsibleFailJson) as exc:
-            my_obj.apply()
-        print('Info: test_update_aws_netapp_cvs_pool_fail: %s' % repr(exc.value))
-        assert exc.value.args[0]['msg'] is not None
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.post')
-    def test_create_aws_netapp_cvs_pool_pass(self, get_post_api, get_aws_api):
-        set_module_args(self.set_args_create_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_aws_api.return_value = None
-        get_post_api.return_value = None, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_pool_pass: %s' % repr(exc.value))
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.post')
-    def test_create_aws_netapp_cvs_pool_fail(self, get_post_api, get_aws_api):
-        set_module_args(self.set_args_create_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_post_api.return_value = my_pool, "Error"
-        get_aws_api.return_value = None
-        with pytest.raises(AnsibleFailJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_pool_fail: %s' % repr(exc.value))
-        assert exc.value.args[0]['msg'] is not None
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.delete')
-    def test_delete_aws_netapp_cvs_pool_pass(self, get_delete_api, get_aws_api):
-        set_module_args(self.set_args_delete_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_aws_api.return_value = my_pool
-        get_delete_api.return_value = None, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_delete_aws_netapp_cvs_pool_pass: %s' % repr(exc.value))
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_pool.NetAppAWSCVS.get_aws_netapp_cvs_pool')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.delete')
-    def test_delete_aws_netapp_cvs_pool_fail(self, get_delete_api, get_aws_api):
-        set_module_args(self.set_args_delete_aws_netapp_cvs_pool())
-        my_obj = pool_module()
-        my_pool = {
-            "name": "Dummyname",
-            "poolId": "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975",
-            "region": "us-east-1",
-            "serviceLevel": "extreme",
-            "sizeInBytes": 40000000000000000,
-            "state": "available",
-            "vendorID": "Dummy"
-        }
-        get_delete_api.return_value = my_pool, "Error"
-        get_aws_api.return_value = my_pool
-        with pytest.raises(AnsibleFailJson) as exc:
-            my_obj.apply()
-        print('Info: test_delete_aws_netapp_cvs_pool_fail: %s' % repr(exc.value))
-        assert exc.value.args[0]['msg'] is not None
diff --git a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_snapshots.py b/test/units/modules/cloud/amazon/test_aws_netapp_cvs_snapshots.py
deleted file mode 100644
index 2bd828e1fb..0000000000
--- a/test/units/modules/cloud/amazon/test_aws_netapp_cvs_snapshots.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# (c) 2019, NetApp, Inc
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-''' unit tests ONTAP Ansible module: aws_netapp_cvs_snapshots'''
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-import json
-import pytest
-
-
-from units.compat import unittest
-from units.compat.mock import patch, Mock
-from ansible.module_utils import basic
-from ansible.module_utils._text import to_bytes
-from requests import Response
-from ansible.modules.cloud.amazon.aws_netapp_cvs_snapshots \
-    import AwsCvsNetappSnapshot as snapshot_module
-
-
-def set_module_args(args):
-    """prepare arguments so that they will be picked up during module creation"""
-    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
-    basic._ANSIBLE_ARGS = to_bytes(args)  # pylint: disable=protected-access
-
-
-class AnsibleExitJson(Exception):
-    """Exception class to be raised by module.exit_json and caught by the test case"""
-    pass
-
-
-class AnsibleFailJson(Exception):
-    """Exception class to be raised by module.fail_json and caught by the test case"""
-    pass
-
-
-def exit_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over exit_json; package return data into an exception"""
-    if 'changed' not in kwargs:
-        kwargs['changed'] = False
-    raise AnsibleExitJson(kwargs)
-
-
-def fail_json(*args, **kwargs):  # pylint: disable=unused-argument
-    """function to patch over fail_json; package return data into an exception"""
-    kwargs['failed'] = True
-    raise AnsibleFailJson(kwargs)
-
-
-class TestMyModule(unittest.TestCase):
-    ''' a group of related Unit Tests '''
-
-    def setUp(self):
-        self.mock_module_helper = patch.multiple(basic.AnsibleModule,
-                                                 exit_json=exit_json,
-                                                 fail_json=fail_json)
-        self.mock_module_helper.start()
-        self.addCleanup(self.mock_module_helper.stop)
-
-    def set_default_args_fail_check(self):
-        return dict({
-            'name': 'TestFilesystem',
-            'fileSystemId': 'standard',
-            'from_name': 'from_TestFilesystem',
-            'region': 'us-east-1',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_default_args_pass_check(self):
-        return dict({
-            'state': 'present',
-            'name': 'testSnapshot',
-            'fileSystemId': 'standard',
-            'from_name': 'from_TestFilesystem',
-            'region': 'us-east-1',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_create_aws_netapp_cvs_snapshots(self):
-        return dict({
-            'state': 'present',
-            'name': 'testSnapshot',
-            'fileSystemId': '123-4213-432-432',
-            'region': 'us-east-1',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def set_args_delete_aws_netapp_cvs_snapshots(self):
-        return dict({
-            'state': 'absent',
-            'name': 'testSnapshot',
-            'region': 'us-east-1',
-            'api_url': 'hostname.com',
-            'api_key': 'myapikey',
-            'secret_key': 'mysecretkey'
-        })
-
-    def test_module_fail_when_required_args_missing(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleFailJson) as exc:
-            set_module_args(self.set_default_args_fail_check())
-            snapshot_module()
-        print('Info: test_module_fail_when_required_args_missing: %s' % exc.value.args[0]['msg'])
-
-    def test_module_fail_when_required_args_present(self):
-        ''' required arguments are reported as errors '''
-        with pytest.raises(AnsibleExitJson) as exc:
-            set_module_args(self.set_default_args_pass_check())
-            snapshot_module()
-            exit_json(changed=True, msg="Induced arguments check")
-        print('Info: test_module_fail_when_required_args_present: %s' % exc.value.args[0]['msg'])
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_snapshots.AwsCvsNetappSnapshot.getSnapshotId')
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_snapshots.AwsCvsNetappSnapshot.getfilesystemId')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.post')
-    def test_create_aws_netapp_cvs_snapshots_pass(self, get_post_api, getfilesystemId, getSnapshotId):
-        set_module_args(self.set_args_create_aws_netapp_cvs_snapshots())
-        my_obj = snapshot_module()
-        getfilesystemId.return_value = 'fiesystemName'
-        getSnapshotId.return_value = None
-        get_post_api.return_value = None, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_snapshots_pass: %s' % repr(exc.value.args[0]))
-        assert exc.value.args[0]['changed']
-
-    @patch('ansible.modules.cloud.amazon.aws_netapp_cvs_snapshots.AwsCvsNetappSnapshot.getSnapshotId')
-    @patch('ansible.module_utils.netapp.AwsCvsRestAPI.delete')
-    def test_delete_aws_netapp_cvs_snapshots_pass(self, get_post_api, getSnapshotId):
-        set_module_args(self.set_args_delete_aws_netapp_cvs_snapshots())
-        my_obj = snapshot_module()
-        getSnapshotId.return_value = "1f63b3d0-4fd4-b4fe-1ed6-c62f5f20d975"
-        get_post_api.return_value = None, None
-        with pytest.raises(AnsibleExitJson) as exc:
-            my_obj.apply()
-        print('Info: test_create_aws_netapp_cvs_snapshots_pass: %s' % repr(exc.value.args[0]))
-        assert exc.value.args[0]['changed']