diff --git a/plugins/modules/gcp_compute_snapshot.py b/plugins/modules/gcp_compute_snapshot.py
new file mode 100644
index 0000000..726f151
--- /dev/null
+++ b/plugins/modules/gcp_compute_snapshot.py
@@ -0,0 +1,523 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Google
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# ----------------------------------------------------------------------------
+#
+#     ***     AUTO GENERATED CODE    ***    AUTO GENERATED CODE     ***
+#
+# ----------------------------------------------------------------------------
+#
+#     This file is automatically generated by Magic Modules and manual
+#     changes will be clobbered when the file is regenerated.
+#
+#     Please read more about how to change this file at
+#     https://www.github.com/GoogleCloudPlatform/magic-modules
+#
+# ----------------------------------------------------------------------------
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+################################################################################
+# Documentation
+################################################################################
+
+ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported_by': 'community'}
+
+DOCUMENTATION = '''
+---
+module: gcp_compute_snapshot
+description:
+- Represents a Persistent Disk Snapshot resource.
+- Use snapshots to back up data from your persistent disks. Snapshots are different
+  from public images and custom images, which are used primarily to create instances
+  or configure instance templates. Snapshots are useful for periodic backup of the
+  data on your persistent disks. You can create snapshots from persistent disks even
+  while they are attached to running instances.
+- Snapshots are incremental, so you can create regular snapshots on a persistent disk
+  faster and at a much lower cost than if you regularly created a full image of the
+  disk.
+short_description: Creates a GCP Snapshot
+version_added: 2.9
+author: Google Inc. (@googlecloudplatform)
+requirements:
+- python >= 2.6
+- requests >= 2.18.4
+- google-auth >= 1.3.0
+options:
+  state:
+    description:
+    - Whether the given object should exist in GCP
+    choices:
+    - present
+    - absent
+    default: present
+    type: str
+  name:
+    description:
+    - Name of the resource; provided by the client when the resource is created. The
+      name must be 1-63 characters long, and comply with RFC1035. Specifically, the
+      name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?`
+      which means the first character must be a lowercase letter, and all following
+      characters must be a dash, lowercase letter, or digit, except the last character,
+      which cannot be a dash.
+    required: true
+    type: str
+  description:
+    description:
+    - An optional description of this resource.
+    required: false
+    type: str
+  labels:
+    description:
+    - Labels to apply to this Snapshot.
+    required: false
+    type: dict
+  source_disk:
+    description:
+    - A reference to the disk used to create this snapshot.
+    - 'This field represents a link to a Disk resource in GCP. It can be specified
+      in two ways. First, you can place a dictionary with key ''name'' and value of
+      your resource''s name Alternatively, you can add `register: name-of-resource`
+      to a gcp_compute_disk task and then set this source_disk field to "{{ name-of-resource
+      }}"'
+    required: true
+    type: dict
+  zone:
+    description:
+    - A reference to the zone where the disk is hosted.
+    required: false
+    type: str
+  snapshot_encryption_key:
+    description:
+    - The customer-supplied encryption key of the snapshot. Required if the source
+      snapshot is protected by a customer-supplied encryption key.
+    required: false
+    type: dict
+    suboptions:
+      raw_key:
+        description:
+        - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+          base64 to either encrypt or decrypt this resource.
+        required: false
+        type: str
+      kms_key_name:
+        description:
+        - The name of the encryption key that is stored in Google Cloud KMS.
+        required: false
+        type: str
+  source_disk_encryption_key:
+    description:
+    - The customer-supplied encryption key of the source snapshot. Required if the
+      source snapshot is protected by a customer-supplied encryption key.
+    required: false
+    type: dict
+    suboptions:
+      raw_key:
+        description:
+        - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+          base64 to either encrypt or decrypt this resource.
+        required: false
+        type: str
+      kms_key_name:
+        description:
+        - The name of the encryption key that is stored in Google Cloud KMS.
+        required: false
+        type: str
+extends_documentation_fragment: gcp
+notes:
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/snapshots)'
+- 'Official Documentation: U(https://cloud.google.com/compute/docs/disks/create-snapshots)'
+'''
+
+EXAMPLES = '''
+- name: create a disk
+  gcp_compute_disk:
+    name: disk-snapshot
+    zone: us-central1-a
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: disk
+
+- name: create a snapshot
+  gcp_compute_snapshot:
+    name: test_object
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: test_project
+    auth_kind: serviceaccount
+    service_account_file: "/tmp/auth.pem"
+    state: present
+'''
+
+RETURN = '''
+creationTimestamp:
+  description:
+  - Creation timestamp in RFC3339 text format.
+  returned: success
+  type: str
+id:
+  description:
+  - The unique identifier for the resource.
+  returned: success
+  type: int
+diskSizeGb:
+  description:
+  - Size of the snapshot, specified in GB.
+  returned: success
+  type: int
+name:
+  description:
+  - Name of the resource; provided by the client when the resource is created. The
+    name must be 1-63 characters long, and comply with RFC1035. Specifically, the
+    name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?`
+    which means the first character must be a lowercase letter, and all following
+    characters must be a dash, lowercase letter, or digit, except the last character,
+    which cannot be a dash.
+  returned: success
+  type: str
+description:
+  description:
+  - An optional description of this resource.
+  returned: success
+  type: str
+storageBytes:
+  description:
+  - A size of the the storage used by the snapshot. As snapshots share storage, this
+    number is expected to change with snapshot creation/deletion.
+  returned: success
+  type: int
+licenses:
+  description:
+  - A list of public visible licenses that apply to this snapshot. This can be because
+    the original image had licenses attached (such as a Windows image). snapshotEncryptionKey
+    nested object Encrypts the snapshot using a customer-supplied encryption key.
+  returned: success
+  type: list
+labels:
+  description:
+  - Labels to apply to this Snapshot.
+  returned: success
+  type: dict
+labelFingerprint:
+  description:
+  - The fingerprint used for optimistic locking of this resource. Used internally
+    during updates.
+  returned: success
+  type: str
+sourceDisk:
+  description:
+  - A reference to the disk used to create this snapshot.
+  returned: success
+  type: dict
+zone:
+  description:
+  - A reference to the zone where the disk is hosted.
+  returned: success
+  type: str
+snapshotEncryptionKey:
+  description:
+  - The customer-supplied encryption key of the snapshot. Required if the source snapshot
+    is protected by a customer-supplied encryption key.
+  returned: success
+  type: complex
+  contains:
+    rawKey:
+      description:
+      - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+        base64 to either encrypt or decrypt this resource.
+      returned: success
+      type: str
+    sha256:
+      description:
+      - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
+        key that protects this resource.
+      returned: success
+      type: str
+    kmsKeyName:
+      description:
+      - The name of the encryption key that is stored in Google Cloud KMS.
+      returned: success
+      type: str
+sourceDiskEncryptionKey:
+  description:
+  - The customer-supplied encryption key of the source snapshot. Required if the source
+    snapshot is protected by a customer-supplied encryption key.
+  returned: success
+  type: complex
+  contains:
+    rawKey:
+      description:
+      - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+        base64 to either encrypt or decrypt this resource.
+      returned: success
+      type: str
+    kmsKeyName:
+      description:
+      - The name of the encryption key that is stored in Google Cloud KMS.
+      returned: success
+      type: str
+'''
+
+################################################################################
+# Imports
+################################################################################
+
+from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest, remove_nones_from_dict, replace_resource_dict
+import json
+import re
+import time
+
+################################################################################
+# Main
+################################################################################
+
+
+def main():
+    """Main function"""
+
+    module = GcpModule(
+        argument_spec=dict(
+            state=dict(default='present', choices=['present', 'absent'], type='str'),
+            name=dict(required=True, type='str'),
+            description=dict(type='str'),
+            labels=dict(type='dict'),
+            source_disk=dict(required=True, type='dict'),
+            zone=dict(type='str'),
+            snapshot_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
+            source_disk_encryption_key=dict(type='dict', options=dict(raw_key=dict(type='str'), kms_key_name=dict(type='str'))),
+        )
+    )
+
+    if not module.params['scopes']:
+        module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
+
+    state = module.params['state']
+    kind = 'compute#snapshot'
+
+    fetch = fetch_resource(module, self_link(module), kind)
+    changed = False
+
+    if fetch:
+        if state == 'present':
+            if is_different(module, fetch):
+                update(module, self_link(module), kind, fetch)
+                fetch = fetch_resource(module, self_link(module), kind)
+                changed = True
+        else:
+            delete(module, self_link(module), kind)
+            fetch = {}
+            changed = True
+    else:
+        if state == 'present':
+            fetch = create(module, create_link(module), kind)
+            changed = True
+        else:
+            fetch = {}
+
+    fetch.update({'changed': changed})
+
+    module.exit_json(**fetch)
+
+
+def create(module, link, kind):
+    auth = GcpSession(module, 'compute')
+    return wait_for_operation(module, auth.post(link, resource_to_request(module)))
+
+
+def update(module, link, kind, fetch):
+    update_fields(module, resource_to_request(module), response_to_hash(module, fetch))
+    return fetch_resource(module, self_link(module), kind)
+
+
+def update_fields(module, request, response):
+    if response.get('labels') != request.get('labels'):
+        labels_update(module, request, response)
+
+
+def labels_update(module, request, response):
+    auth = GcpSession(module, 'compute')
+    auth.post(
+        ''.join(["https://www.googleapis.com/compute/v1/", "projects/{project}/global/snapshots/{name}/setLabels"]).format(**module.params),
+        {u'labels': module.params.get('labels'), u'labelFingerprint': response.get('labelFingerprint')},
+    )
+
+
+def delete(module, link, kind):
+    auth = GcpSession(module, 'compute')
+    return wait_for_operation(module, auth.delete(link))
+
+
+def resource_to_request(module):
+    request = {
+        u'kind': 'compute#snapshot',
+        u'sourceDisk': replace_resource_dict(module.params.get(u'source_disk', {}), 'name'),
+        u'zone': module.params.get('zone'),
+        u'name': module.params.get('name'),
+        u'description': module.params.get('description'),
+        u'labels': module.params.get('labels'),
+    }
+    return_vals = {}
+    for k, v in request.items():
+        if v or v is False:
+            return_vals[k] = v
+
+    return return_vals
+
+
+def fetch_resource(module, link, kind, allow_not_found=True):
+    auth = GcpSession(module, 'compute')
+    return return_if_object(module, auth.get(link), kind, allow_not_found)
+
+
+def self_link(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/global/snapshots/{name}".format(**module.params)
+
+
+def collection(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/global/snapshots".format(**module.params)
+
+
+def create_link(module):
+    res = {'project': module.params['project'], 'zone': module.params['zone'], 'source_disk': replace_resource_dict(module.params['source_disk'], 'name')}
+    return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/disks/{source_disk}/createSnapshot".format(**res)
+
+
+def return_if_object(module, response, kind, allow_not_found=False):
+    # If not found, return nothing.
+    if allow_not_found and response.status_code == 404:
+        return None
+
+    # If no content, return nothing.
+    if response.status_code == 204:
+        return None
+
+    try:
+        module.raise_for_status(response)
+        result = response.json()
+    except getattr(json.decoder, 'JSONDecodeError', ValueError):
+        module.fail_json(msg="Invalid JSON response with error: %s" % response.text)
+
+    if navigate_hash(result, ['error', 'errors']):
+        module.fail_json(msg=navigate_hash(result, ['error', 'errors']))
+
+    return result
+
+
+def is_different(module, response):
+    request = resource_to_request(module)
+    response = response_to_hash(module, response)
+
+    # Remove all output-only from response.
+    response_vals = {}
+    for k, v in response.items():
+        if k in request:
+            response_vals[k] = v
+
+    request_vals = {}
+    for k, v in request.items():
+        if k in response:
+            request_vals[k] = v
+
+    return GcpRequest(request_vals) != GcpRequest(response_vals)
+
+
+# Remove unnecessary properties from the response.
+# This is for doing comparisons with Ansible's current parameters.
+def response_to_hash(module, response):
+    return {
+        u'creationTimestamp': response.get(u'creationTimestamp'),
+        u'id': response.get(u'id'),
+        u'diskSizeGb': response.get(u'diskSizeGb'),
+        u'name': module.params.get('name'),
+        u'description': module.params.get('description'),
+        u'storageBytes': response.get(u'storageBytes'),
+        u'licenses': response.get(u'licenses'),
+        u'labels': response.get(u'labels'),
+        u'labelFingerprint': response.get(u'labelFingerprint'),
+    }
+
+
+def license_selflink(name, params):
+    if name is None:
+        return
+    url = r"https://www.googleapis.com/compute/v1//projects/.*/global/licenses/.*"
+    if not re.match(url, name):
+        name = "https://www.googleapis.com/compute/v1//projects/{project}/global/licenses/%s".format(**params) % name
+    return name
+
+
+def async_op_url(module, extra_data=None):
+    if extra_data is None:
+        extra_data = {}
+    url = "https://www.googleapis.com/compute/v1/"
+    combined = extra_data.copy()
+    combined.update(module.params)
+    return url.format(**combined)
+
+
+def wait_for_operation(module, response):
+    op_result = return_if_object(module, response, 'compute#operation')
+    if op_result is None:
+        return {}
+    status = navigate_hash(op_result, ['status'])
+    wait_done = wait_for_completion(status, op_result, module)
+    return fetch_resource(module, navigate_hash(wait_done, ['targetLink']), 'compute#snapshot')
+
+
+def wait_for_completion(status, op_result, module):
+    op_id = navigate_hash(op_result, ['name'])
+    op_uri = navigate_hash(op_result, ['selfLink'])
+    while status != 'DONE':
+        raise_if_errors(op_result, ['error', 'errors'], module)
+        time.sleep(1.0)
+        op_result = fetch_resource(module, op_uri, 'compute#operation', False)
+        status = navigate_hash(op_result, ['status'])
+    return op_result
+
+
+def raise_if_errors(response, err_path, module):
+    errors = navigate_hash(response, err_path)
+    if errors is not None:
+        module.fail_json(msg=errors)
+
+
+class SnapshotSnapshotencryptionkey(object):
+    def __init__(self, request, module):
+        self.module = module
+        if request:
+            self.request = request
+        else:
+            self.request = {}
+
+    def to_request(self):
+        return remove_nones_from_dict({u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name')})
+
+    def from_response(self):
+        return remove_nones_from_dict({u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName')})
+
+
+class SnapshotSourcediskencryptionkey(object):
+    def __init__(self, request, module):
+        self.module = module
+        if request:
+            self.request = request
+        else:
+            self.request = {}
+
+    def to_request(self):
+        return remove_nones_from_dict({u'rawKey': self.request.get('raw_key'), u'kmsKeyName': self.request.get('kms_key_name')})
+
+    def from_response(self):
+        return remove_nones_from_dict({u'rawKey': self.request.get(u'rawKey'), u'kmsKeyName': self.request.get(u'kmsKeyName')})
+
+
+if __name__ == '__main__':
+    main()
diff --git a/plugins/modules/gcp_compute_snapshot_facts.py b/plugins/modules/gcp_compute_snapshot_facts.py
new file mode 100644
index 0000000..abd1057
--- /dev/null
+++ b/plugins/modules/gcp_compute_snapshot_facts.py
@@ -0,0 +1,253 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2017 Google
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# ----------------------------------------------------------------------------
+#
+#     ***     AUTO GENERATED CODE    ***    AUTO GENERATED CODE     ***
+#
+# ----------------------------------------------------------------------------
+#
+#     This file is automatically generated by Magic Modules and manual
+#     changes will be clobbered when the file is regenerated.
+#
+#     Please read more about how to change this file at
+#     https://www.github.com/GoogleCloudPlatform/magic-modules
+#
+# ----------------------------------------------------------------------------
+
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
+
+################################################################################
+# Documentation
+################################################################################
+
+ANSIBLE_METADATA = {'metadata_version': '1.1', 'status': ["preview"], 'supported_by': 'community'}
+
+DOCUMENTATION = '''
+---
+module: gcp_compute_snapshot_facts
+description:
+- Gather facts for GCP Snapshot
+short_description: Gather facts for GCP Snapshot
+version_added: 2.9
+author: Google Inc. (@googlecloudplatform)
+requirements:
+- python >= 2.6
+- requests >= 2.18.4
+- google-auth >= 1.3.0
+options:
+  filters:
+    description:
+    - A list of filter value pairs. Available filters are listed here U(https://cloud.google.com/sdk/gcloud/reference/topic/filters).
+    - Each additional filter in the list will act be added as an AND condition (filter1
+      and filter2) .
+extends_documentation_fragment: gcp
+'''
+
+EXAMPLES = '''
+- name: " a snapshot facts"
+  gcp_compute_snapshot_facts:
+    filters:
+    - name = test_object
+    project: test_project
+    auth_kind: serviceaccount
+    service_account_file: "/tmp/auth.pem"
+    state: facts
+'''
+
+RETURN = '''
+resources:
+  description: List of resources
+  returned: always
+  type: complex
+  contains:
+    creationTimestamp:
+      description:
+      - Creation timestamp in RFC3339 text format.
+      returned: success
+      type: str
+    id:
+      description:
+      - The unique identifier for the resource.
+      returned: success
+      type: int
+    diskSizeGb:
+      description:
+      - Size of the snapshot, specified in GB.
+      returned: success
+      type: int
+    name:
+      description:
+      - Name of the resource; provided by the client when the resource is created.
+        The name must be 1-63 characters long, and comply with RFC1035. Specifically,
+        the name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?`
+        which means the first character must be a lowercase letter, and all following
+        characters must be a dash, lowercase letter, or digit, except the last character,
+        which cannot be a dash.
+      returned: success
+      type: str
+    description:
+      description:
+      - An optional description of this resource.
+      returned: success
+      type: str
+    storageBytes:
+      description:
+      - A size of the the storage used by the snapshot. As snapshots share storage,
+        this number is expected to change with snapshot creation/deletion.
+      returned: success
+      type: int
+    licenses:
+      description:
+      - A list of public visible licenses that apply to this snapshot. This can be
+        because the original image had licenses attached (such as a Windows image).
+        snapshotEncryptionKey nested object Encrypts the snapshot using a customer-supplied
+        encryption key.
+      returned: success
+      type: list
+    labels:
+      description:
+      - Labels to apply to this Snapshot.
+      returned: success
+      type: dict
+    labelFingerprint:
+      description:
+      - The fingerprint used for optimistic locking of this resource. Used internally
+        during updates.
+      returned: success
+      type: str
+    sourceDisk:
+      description:
+      - A reference to the disk used to create this snapshot.
+      returned: success
+      type: dict
+    zone:
+      description:
+      - A reference to the zone where the disk is hosted.
+      returned: success
+      type: str
+    snapshotEncryptionKey:
+      description:
+      - The customer-supplied encryption key of the snapshot. Required if the source
+        snapshot is protected by a customer-supplied encryption key.
+      returned: success
+      type: complex
+      contains:
+        rawKey:
+          description:
+          - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+            base64 to either encrypt or decrypt this resource.
+          returned: success
+          type: str
+        sha256:
+          description:
+          - The RFC 4648 base64 encoded SHA-256 hash of the customer-supplied encryption
+            key that protects this resource.
+          returned: success
+          type: str
+        kmsKeyName:
+          description:
+          - The name of the encryption key that is stored in Google Cloud KMS.
+          returned: success
+          type: str
+    sourceDiskEncryptionKey:
+      description:
+      - The customer-supplied encryption key of the source snapshot. Required if the
+        source snapshot is protected by a customer-supplied encryption key.
+      returned: success
+      type: complex
+      contains:
+        rawKey:
+          description:
+          - Specifies a 256-bit customer-supplied encryption key, encoded in RFC 4648
+            base64 to either encrypt or decrypt this resource.
+          returned: success
+          type: str
+        kmsKeyName:
+          description:
+          - The name of the encryption key that is stored in Google Cloud KMS.
+          returned: success
+          type: str
+'''
+
+################################################################################
+# Imports
+################################################################################
+from ansible.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest
+import json
+
+################################################################################
+# Main
+################################################################################
+
+
+def main():
+    module = GcpModule(argument_spec=dict(filters=dict(type='list', elements='str')))
+
+    if not module.params['scopes']:
+        module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
+
+    items = fetch_list(module, collection(module), query_options(module.params['filters']))
+    if items.get('items'):
+        items = items.get('items')
+    else:
+        items = []
+    return_value = {'resources': items}
+    module.exit_json(**return_value)
+
+
+def collection(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/global/snapshots".format(**module.params)
+
+
+def fetch_list(module, link, query):
+    auth = GcpSession(module, 'compute')
+    response = auth.get(link, params={'filter': query})
+    return return_if_object(module, response)
+
+
+def query_options(filters):
+    if not filters:
+        return ''
+
+    if len(filters) == 1:
+        return filters[0]
+    else:
+        queries = []
+        for f in filters:
+            # For multiple queries, all queries should have ()
+            if f[0] != '(' and f[-1] != ')':
+                queries.append("(%s)" % ''.join(f))
+            else:
+                queries.append(f)
+
+        return ' '.join(queries)
+
+
+def return_if_object(module, response):
+    # If not found, return nothing.
+    if response.status_code == 404:
+        return None
+
+    # If no content, return nothing.
+    if response.status_code == 204:
+        return None
+
+    try:
+        module.raise_for_status(response)
+        result = response.json()
+    except getattr(json.decoder, 'JSONDecodeError', ValueError) as inst:
+        module.fail_json(msg="Invalid JSON response with error: %s" % inst)
+
+    if navigate_hash(result, ['error', 'errors']):
+        module.fail_json(msg=navigate_hash(result, ['error', 'errors']))
+
+    return result
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/integration/gcp_bigquery_dataset/tasks/main.yml b/tests/integration/gcp_bigquery_dataset/tasks/main.yml
index 0eba0b4..a37964f 100644
--- a/tests/integration/gcp_bigquery_dataset/tasks/main.yml
+++ b/tests/integration/gcp_bigquery_dataset/tasks/main.yml
@@ -37,7 +37,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'bigquery#dataset'"
 - name: verify that dataset was created
   gcp_bigquery_dataset_facts:
       project: "{{ gcp_project }}"
@@ -65,7 +64,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'bigquery#dataset'"
 #----------------------------------------------------------
 - name: delete a dataset
   gcp_bigquery_dataset:
diff --git a/tests/integration/gcp_bigquery_table/tasks/main.yml b/tests/integration/gcp_bigquery_table/tasks/main.yml
index 8d45409..90993be 100644
--- a/tests/integration/gcp_bigquery_table/tasks/main.yml
+++ b/tests/integration/gcp_bigquery_table/tasks/main.yml
@@ -53,7 +53,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'bigquery#table'"
 - name: verify that table was created
   gcp_bigquery_table_facts:
       dataset: example_dataset
@@ -85,7 +84,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'bigquery#table'"
 #----------------------------------------------------------
 - name: delete a table
   gcp_bigquery_table:
diff --git a/tests/integration/gcp_compute_address/tasks/main.yml b/tests/integration/gcp_compute_address/tasks/main.yml
index 7163123..cf6cda5 100644
--- a/tests/integration/gcp_compute_address/tasks/main.yml
+++ b/tests/integration/gcp_compute_address/tasks/main.yml
@@ -35,7 +35,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#address'"
 - name: verify that address was created
   gcp_compute_address_facts:
       filters:
@@ -65,7 +64,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#address'"
 #----------------------------------------------------------
 - name: delete a address
   gcp_compute_address:
diff --git a/tests/integration/gcp_compute_backend_bucket/tasks/main.yml b/tests/integration/gcp_compute_backend_bucket/tasks/main.yml
index 35c452d..fa7feb8 100644
--- a/tests/integration/gcp_compute_backend_bucket/tasks/main.yml
+++ b/tests/integration/gcp_compute_backend_bucket/tasks/main.yml
@@ -47,7 +47,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#backendBucket'"
 - name: verify that backend_bucket was created
   gcp_compute_backend_bucket_facts:
       filters:
@@ -78,7 +77,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#backendBucket'"
 #----------------------------------------------------------
 - name: delete a backend bucket
   gcp_compute_backend_bucket:
diff --git a/tests/integration/gcp_compute_backend_service/tasks/main.yml b/tests/integration/gcp_compute_backend_service/tasks/main.yml
index 8e49959..5457be1 100644
--- a/tests/integration/gcp_compute_backend_service/tasks/main.yml
+++ b/tests/integration/gcp_compute_backend_service/tasks/main.yml
@@ -64,7 +64,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#backendService'"
 - name: verify that backend_service was created
   gcp_compute_backend_service_facts:
       filters:
@@ -97,7 +96,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#backendService'"
 #----------------------------------------------------------
 - name: delete a backend service
   gcp_compute_backend_service:
diff --git a/tests/integration/gcp_compute_disk/tasks/main.yml b/tests/integration/gcp_compute_disk/tasks/main.yml
index bc524b1..874176d 100644
--- a/tests/integration/gcp_compute_disk/tasks/main.yml
+++ b/tests/integration/gcp_compute_disk/tasks/main.yml
@@ -41,7 +41,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#disk'"
 - name: verify that disk was created
   gcp_compute_disk_facts:
       filters:
@@ -74,7 +73,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#disk'"
 #----------------------------------------------------------
 - name: delete a disk
   gcp_compute_disk:
diff --git a/tests/integration/gcp_compute_firewall/tasks/main.yml b/tests/integration/gcp_compute_firewall/tasks/main.yml
index b58e1fd..231eb28 100644
--- a/tests/integration/gcp_compute_firewall/tasks/main.yml
+++ b/tests/integration/gcp_compute_firewall/tasks/main.yml
@@ -51,7 +51,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#firewall'"
 - name: verify that firewall was created
   gcp_compute_firewall_facts:
       filters:
@@ -88,7 +87,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#firewall'"
 #----------------------------------------------------------
 - name: delete a firewall
   gcp_compute_firewall:
diff --git a/tests/integration/gcp_compute_forwarding_rule/tasks/main.yml b/tests/integration/gcp_compute_forwarding_rule/tasks/main.yml
index facd4da..c0560df 100644
--- a/tests/integration/gcp_compute_forwarding_rule/tasks/main.yml
+++ b/tests/integration/gcp_compute_forwarding_rule/tasks/main.yml
@@ -61,7 +61,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#forwardingRule'"
 - name: verify that forwarding_rule was created
   gcp_compute_forwarding_rule_facts:
       filters:
@@ -95,7 +94,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#forwardingRule'"
 #----------------------------------------------------------
 - name: delete a forwarding rule
   gcp_compute_forwarding_rule:
diff --git a/tests/integration/gcp_compute_global_address/tasks/main.yml b/tests/integration/gcp_compute_global_address/tasks/main.yml
index c0cc109..8dbfa8b 100644
--- a/tests/integration/gcp_compute_global_address/tasks/main.yml
+++ b/tests/integration/gcp_compute_global_address/tasks/main.yml
@@ -33,7 +33,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#address'"
 - name: verify that global_address was created
   gcp_compute_global_address_facts:
       filters:
@@ -61,7 +60,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#address'"
 #----------------------------------------------------------
 - name: delete a global address
   gcp_compute_global_address:
diff --git a/tests/integration/gcp_compute_global_forwarding_rule/tasks/main.yml b/tests/integration/gcp_compute_global_forwarding_rule/tasks/main.yml
index 91eae25..3f7f00b 100644
--- a/tests/integration/gcp_compute_global_forwarding_rule/tasks/main.yml
+++ b/tests/integration/gcp_compute_global_forwarding_rule/tasks/main.yml
@@ -101,7 +101,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#forwardingRule'"
 - name: verify that global_forwarding_rule was created
   gcp_compute_global_forwarding_rule_facts:
       filters:
@@ -133,7 +132,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#forwardingRule'"
 #----------------------------------------------------------
 - name: delete a global forwarding rule
   gcp_compute_global_forwarding_rule:
diff --git a/tests/integration/gcp_compute_health_check/tasks/main.yml b/tests/integration/gcp_compute_health_check/tasks/main.yml
index 13a5fd6..72aed16 100644
--- a/tests/integration/gcp_compute_health_check/tasks/main.yml
+++ b/tests/integration/gcp_compute_health_check/tasks/main.yml
@@ -49,7 +49,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#healthCheck'"
 - name: verify that health_check was created
   gcp_compute_health_check_facts:
       filters:
@@ -85,7 +84,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#healthCheck'"
 #----------------------------------------------------------
 - name: delete a health check
   gcp_compute_health_check:
diff --git a/tests/integration/gcp_compute_http_health_check/tasks/main.yml b/tests/integration/gcp_compute_http_health_check/tasks/main.yml
index 62fa3d3..948568e 100644
--- a/tests/integration/gcp_compute_http_health_check/tasks/main.yml
+++ b/tests/integration/gcp_compute_http_health_check/tasks/main.yml
@@ -41,7 +41,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#httpHealthCheck'"
 - name: verify that http_health_check was created
   gcp_compute_http_health_check_facts:
       filters:
@@ -73,7 +72,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#httpHealthCheck'"
 #----------------------------------------------------------
 - name: delete a http health check
   gcp_compute_http_health_check:
diff --git a/tests/integration/gcp_compute_https_health_check/tasks/main.yml b/tests/integration/gcp_compute_https_health_check/tasks/main.yml
index 8aabb0b..d9952c2 100644
--- a/tests/integration/gcp_compute_https_health_check/tasks/main.yml
+++ b/tests/integration/gcp_compute_https_health_check/tasks/main.yml
@@ -41,7 +41,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#httpsHealthCheck'"
 - name: verify that https_health_check was created
   gcp_compute_https_health_check_facts:
       filters:
@@ -73,7 +72,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#httpsHealthCheck'"
 #----------------------------------------------------------
 - name: delete a https health check
   gcp_compute_https_health_check:
diff --git a/tests/integration/gcp_compute_image/tasks/main.yml b/tests/integration/gcp_compute_image/tasks/main.yml
index 6ddc818..05706b6 100644
--- a/tests/integration/gcp_compute_image/tasks/main.yml
+++ b/tests/integration/gcp_compute_image/tasks/main.yml
@@ -44,7 +44,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#image'"
 - name: verify that image was created
   gcp_compute_image_facts:
       filters:
@@ -73,7 +72,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#image'"
 #----------------------------------------------------------
 - name: delete a image
   gcp_compute_image:
diff --git a/tests/integration/gcp_compute_instance/tasks/main.yml b/tests/integration/gcp_compute_instance/tasks/main.yml
index baf5442..b173e79 100644
--- a/tests/integration/gcp_compute_instance/tasks/main.yml
+++ b/tests/integration/gcp_compute_instance/tasks/main.yml
@@ -95,7 +95,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#instance'"
 - name: verify that instance was created
   gcp_compute_instance_facts:
       filters:
@@ -141,7 +140,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#instance'"
 #----------------------------------------------------------
 - name: delete a instance
   gcp_compute_instance:
diff --git a/tests/integration/gcp_compute_instance_group/tasks/main.yml b/tests/integration/gcp_compute_instance_group/tasks/main.yml
index 0ac5d42..2687523 100644
--- a/tests/integration/gcp_compute_instance_group/tasks/main.yml
+++ b/tests/integration/gcp_compute_instance_group/tasks/main.yml
@@ -51,7 +51,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#instanceGroup'"
 - name: verify that instance_group was created
   gcp_compute_instance_group_facts:
       filters:
@@ -85,7 +84,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#instanceGroup'"
 #----------------------------------------------------------
 - name: delete a instance group
   gcp_compute_instance_group:
diff --git a/tests/integration/gcp_compute_instance_group_manager/tasks/main.yml b/tests/integration/gcp_compute_instance_group_manager/tasks/main.yml
index 961b079..1ce66ab 100644
--- a/tests/integration/gcp_compute_instance_group_manager/tasks/main.yml
+++ b/tests/integration/gcp_compute_instance_group_manager/tasks/main.yml
@@ -79,7 +79,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#instanceGroupManager'"
 - name: verify that instance_group_manager was created
   gcp_compute_instance_group_manager_facts:
       filters:
@@ -112,7 +111,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#instanceGroupManager'"
 #----------------------------------------------------------
 - name: delete a instance group manager
   gcp_compute_instance_group_manager:
diff --git a/tests/integration/gcp_compute_instance_template/tasks/main.yml b/tests/integration/gcp_compute_instance_template/tasks/main.yml
index 6d0fcf4..9d5f809 100644
--- a/tests/integration/gcp_compute_instance_template/tasks/main.yml
+++ b/tests/integration/gcp_compute_instance_template/tasks/main.yml
@@ -76,7 +76,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#instanceTemplate'"
 - name: verify that instance_template was created
   gcp_compute_instance_template_facts:
       filters:
@@ -117,7 +116,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#instanceTemplate'"
 #----------------------------------------------------------
 - name: delete a instance template
   gcp_compute_instance_template:
diff --git a/tests/integration/gcp_compute_network/tasks/main.yml b/tests/integration/gcp_compute_network/tasks/main.yml
index a20f358..a20a9ff 100644
--- a/tests/integration/gcp_compute_network/tasks/main.yml
+++ b/tests/integration/gcp_compute_network/tasks/main.yml
@@ -35,7 +35,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#network'"
 - name: verify that network was created
   gcp_compute_network_facts:
       filters:
@@ -64,7 +63,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#network'"
 #----------------------------------------------------------
 - name: delete a network
   gcp_compute_network:
diff --git a/tests/integration/gcp_compute_region_disk/tasks/main.yml b/tests/integration/gcp_compute_region_disk/tasks/main.yml
index 85d7aa3..b2cc4e6 100644
--- a/tests/integration/gcp_compute_region_disk/tasks/main.yml
+++ b/tests/integration/gcp_compute_region_disk/tasks/main.yml
@@ -47,7 +47,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#disk'"
 - name: verify that region_disk was created
   gcp_compute_region_disk_facts:
       filters:
@@ -83,7 +82,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#disk'"
 #----------------------------------------------------------
 - name: delete a region disk
   gcp_compute_region_disk:
diff --git a/tests/integration/gcp_compute_route/tasks/main.yml b/tests/integration/gcp_compute_route/tasks/main.yml
index dbf5540..ebaaa65 100644
--- a/tests/integration/gcp_compute_route/tasks/main.yml
+++ b/tests/integration/gcp_compute_route/tasks/main.yml
@@ -53,7 +53,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#route'"
 - name: verify that route was created
   gcp_compute_route_facts:
       filters:
@@ -87,7 +86,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#route'"
 #----------------------------------------------------------
 - name: delete a route
   gcp_compute_route:
diff --git a/tests/integration/gcp_compute_router/tasks/main.yml b/tests/integration/gcp_compute_router/tasks/main.yml
index eb4f89f..da46eb2 100644
--- a/tests/integration/gcp_compute_router/tasks/main.yml
+++ b/tests/integration/gcp_compute_router/tasks/main.yml
@@ -61,7 +61,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#router'"
 - name: verify that router was created
   gcp_compute_router_facts:
       filters:
@@ -100,7 +99,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#router'"
 #----------------------------------------------------------
 - name: delete a router
   gcp_compute_router:
diff --git a/tests/integration/gcp_compute_snapshot/aliases b/tests/integration/gcp_compute_snapshot/aliases
new file mode 100644
index 0000000..9812f01
--- /dev/null
+++ b/tests/integration/gcp_compute_snapshot/aliases
@@ -0,0 +1,2 @@
+cloud/gcp
+unsupported
diff --git a/tests/integration/gcp_compute_snapshot/defaults/main.yml b/tests/integration/gcp_compute_snapshot/defaults/main.yml
new file mode 100644
index 0000000..ba66644
--- /dev/null
+++ b/tests/integration/gcp_compute_snapshot/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+resource_name: "{{ resource_prefix }}"
diff --git a/tests/integration/gcp_compute_snapshot/meta/main.yml b/tests/integration/gcp_compute_snapshot/meta/main.yml
new file mode 100644
index 0000000..e69de29
diff --git a/tests/integration/gcp_compute_snapshot/tasks/main.yml b/tests/integration/gcp_compute_snapshot/tasks/main.yml
new file mode 100644
index 0000000..541496b
--- /dev/null
+++ b/tests/integration/gcp_compute_snapshot/tasks/main.yml
@@ -0,0 +1,144 @@
+---
+# ----------------------------------------------------------------------------
+#
+#     ***     AUTO GENERATED CODE    ***    AUTO GENERATED CODE     ***
+#
+# ----------------------------------------------------------------------------
+#
+#     This file is automatically generated by Magic Modules and manual
+#     changes will be clobbered when the file is regenerated.
+#
+#     Please read more about how to change this file at
+#     https://www.github.com/GoogleCloudPlatform/magic-modules
+#
+# ----------------------------------------------------------------------------
+# Pre-test setup
+- name: create a disk
+  gcp_compute_disk:
+    name: disk-snapshot
+    zone: us-central1-a
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: disk
+- name: delete a snapshot
+  gcp_compute_snapshot:
+    name: "{{ resource_name }}"
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+#----------------------------------------------------------
+- name: create a snapshot
+  gcp_compute_snapshot:
+    name: "{{ resource_name }}"
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: result
+- name: assert changed is true
+  assert:
+    that:
+      - result.changed == true
+- name: verify that snapshot was created
+  gcp_compute_snapshot_facts:
+      filters:
+         - name = {{ resource_name }}
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/compute
+  register: results
+- name: verify that command succeeded
+  assert:
+    that:
+      - results['resources'] | length == 1
+# ----------------------------------------------------------------------------
+- name: create a snapshot that already exists
+  gcp_compute_snapshot:
+    name: "{{ resource_name }}"
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: result
+- name: assert changed is false
+  assert:
+    that:
+      - result.changed == false
+#----------------------------------------------------------
+- name: delete a snapshot
+  gcp_compute_snapshot:
+    name: "{{ resource_name }}"
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+  register: result
+- name: assert changed is true
+  assert:
+    that:
+      - result.changed == true
+- name: verify that snapshot was deleted
+  gcp_compute_snapshot_facts:
+      filters:
+         - name = {{ resource_name }}
+      project: "{{ gcp_project }}"
+      auth_kind: "{{ gcp_cred_kind }}"
+      service_account_file: "{{ gcp_cred_file }}"
+      scopes:
+        - https://www.googleapis.com/auth/compute
+  register: results
+- name: verify that command succeeded
+  assert:
+    that:
+      - results['resources'] | length == 0
+# ----------------------------------------------------------------------------
+- name: delete a snapshot that does not exist
+  gcp_compute_snapshot:
+    name: "{{ resource_name }}"
+    source_disk: "{{ disk }}"
+    zone: us-central1-a
+    labels:
+      my_label: value
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+  register: result
+- name: assert changed is false
+  assert:
+    that:
+      - result.changed == false
+#---------------------------------------------------------
+# Post-test teardown
+# If errors happen, don't crash the playbook!
+- name: delete a disk
+  gcp_compute_disk:
+    name: disk-snapshot
+    zone: us-central1-a
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+  register: disk
+  ignore_errors: true
diff --git a/tests/integration/gcp_compute_ssl_certificate/tasks/main.yml b/tests/integration/gcp_compute_ssl_certificate/tasks/main.yml
index c4847e7..b715841 100644
--- a/tests/integration/gcp_compute_ssl_certificate/tasks/main.yml
+++ b/tests/integration/gcp_compute_ssl_certificate/tasks/main.yml
@@ -83,7 +83,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#sslCertificate'"
 - name: verify that ssl_certificate was created
   gcp_compute_ssl_certificate_facts:
       filters:
@@ -136,7 +135,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#sslCertificate'"
 #----------------------------------------------------------
 - name: delete a ssl certificate
   gcp_compute_ssl_certificate:
diff --git a/tests/integration/gcp_compute_ssl_policy/tasks/main.yml b/tests/integration/gcp_compute_ssl_policy/tasks/main.yml
index 4073a31..56d27b6 100644
--- a/tests/integration/gcp_compute_ssl_policy/tasks/main.yml
+++ b/tests/integration/gcp_compute_ssl_policy/tasks/main.yml
@@ -43,7 +43,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#sslPolicy'"
 - name: verify that ssl_policy was created
   gcp_compute_ssl_policy_facts:
       filters:
@@ -76,7 +75,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#sslPolicy'"
 #----------------------------------------------------------
 - name: delete a ssl policy
   gcp_compute_ssl_policy:
diff --git a/tests/integration/gcp_compute_subnetwork/tasks/main.yml b/tests/integration/gcp_compute_subnetwork/tasks/main.yml
index 6a865a7..a1e8672 100644
--- a/tests/integration/gcp_compute_subnetwork/tasks/main.yml
+++ b/tests/integration/gcp_compute_subnetwork/tasks/main.yml
@@ -48,7 +48,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#subnetwork'"
 - name: verify that subnetwork was created
   gcp_compute_subnetwork_facts:
       filters:
@@ -80,7 +79,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#subnetwork'"
 #----------------------------------------------------------
 - name: delete a subnetwork
   gcp_compute_subnetwork:
diff --git a/tests/integration/gcp_compute_target_http_proxy/tasks/main.yml b/tests/integration/gcp_compute_target_http_proxy/tasks/main.yml
index 761b298..23bb301 100644
--- a/tests/integration/gcp_compute_target_http_proxy/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_http_proxy/tasks/main.yml
@@ -78,7 +78,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetHttpProxy'"
 - name: verify that target_http_proxy was created
   gcp_compute_target_http_proxy_facts:
       filters:
@@ -107,7 +106,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetHttpProxy'"
 #----------------------------------------------------------
 - name: delete a target http proxy
   gcp_compute_target_http_proxy:
diff --git a/tests/integration/gcp_compute_target_https_proxy/tasks/main.yml b/tests/integration/gcp_compute_target_https_proxy/tasks/main.yml
index 3ec4205..ac44952 100644
--- a/tests/integration/gcp_compute_target_https_proxy/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_https_proxy/tasks/main.yml
@@ -115,7 +115,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetHttpsProxy'"
 - name: verify that target_https_proxy was created
   gcp_compute_target_https_proxy_facts:
       filters:
@@ -146,7 +145,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetHttpsProxy'"
 #----------------------------------------------------------
 - name: delete a target https proxy
   gcp_compute_target_https_proxy:
diff --git a/tests/integration/gcp_compute_target_pool/tasks/main.yml b/tests/integration/gcp_compute_target_pool/tasks/main.yml
index fcc07bc..c5e83fc 100644
--- a/tests/integration/gcp_compute_target_pool/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_pool/tasks/main.yml
@@ -35,7 +35,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetPool'"
 - name: verify that target_pool was created
   gcp_compute_target_pool_facts:
       filters:
@@ -65,7 +64,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetPool'"
 #----------------------------------------------------------
 - name: delete a target pool
   gcp_compute_target_pool:
diff --git a/tests/integration/gcp_compute_target_ssl_proxy/tasks/main.yml b/tests/integration/gcp_compute_target_ssl_proxy/tasks/main.yml
index edea932..3284559 100644
--- a/tests/integration/gcp_compute_target_ssl_proxy/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_ssl_proxy/tasks/main.yml
@@ -110,7 +110,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetSslProxy'"
 - name: verify that target_ssl_proxy was created
   gcp_compute_target_ssl_proxy_facts:
       filters:
@@ -141,7 +140,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetSslProxy'"
 #----------------------------------------------------------
 - name: delete a target ssl proxy
   gcp_compute_target_ssl_proxy:
diff --git a/tests/integration/gcp_compute_target_tcp_proxy/tasks/main.yml b/tests/integration/gcp_compute_target_tcp_proxy/tasks/main.yml
index bf531bd..55d72bc 100644
--- a/tests/integration/gcp_compute_target_tcp_proxy/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_tcp_proxy/tasks/main.yml
@@ -75,7 +75,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetTcpProxy'"
 - name: verify that target_tcp_proxy was created
   gcp_compute_target_tcp_proxy_facts:
       filters:
@@ -105,7 +104,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetTcpProxy'"
 #----------------------------------------------------------
 - name: delete a target tcp proxy
   gcp_compute_target_tcp_proxy:
diff --git a/tests/integration/gcp_compute_target_vpn_gateway/tasks/main.yml b/tests/integration/gcp_compute_target_vpn_gateway/tasks/main.yml
index 5db4472..c2d2e86 100644
--- a/tests/integration/gcp_compute_target_vpn_gateway/tasks/main.yml
+++ b/tests/integration/gcp_compute_target_vpn_gateway/tasks/main.yml
@@ -54,7 +54,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#targetVpnGateway'"
 - name: verify that target_vpn_gateway was created
   gcp_compute_target_vpn_gateway_facts:
       filters:
@@ -85,7 +84,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#targetVpnGateway'"
 #----------------------------------------------------------
 - name: delete a target vpn gateway
   gcp_compute_target_vpn_gateway:
diff --git a/tests/integration/gcp_compute_url_map/tasks/main.yml b/tests/integration/gcp_compute_url_map/tasks/main.yml
index 7d8d45a..e7b4ca2 100644
--- a/tests/integration/gcp_compute_url_map/tasks/main.yml
+++ b/tests/integration/gcp_compute_url_map/tasks/main.yml
@@ -69,7 +69,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#urlMap'"
 - name: verify that url_map was created
   gcp_compute_url_map_facts:
       filters:
@@ -98,7 +97,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#urlMap'"
 #----------------------------------------------------------
 - name: delete a url map
   gcp_compute_url_map:
diff --git a/tests/integration/gcp_compute_vpn_tunnel/tasks/main.yml b/tests/integration/gcp_compute_vpn_tunnel/tasks/main.yml
index b13d306..63a9643 100644
--- a/tests/integration/gcp_compute_vpn_tunnel/tasks/main.yml
+++ b/tests/integration/gcp_compute_vpn_tunnel/tasks/main.yml
@@ -77,7 +77,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'compute#vpnTunnel'"
 - name: verify that vpn_tunnel was created
   gcp_compute_vpn_tunnel_facts:
       filters:
@@ -110,7 +109,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'compute#vpnTunnel'"
 #----------------------------------------------------------
 - name: delete a vpn tunnel
   gcp_compute_vpn_tunnel:
diff --git a/tests/integration/gcp_dns_managed_zone/tasks/main.yml b/tests/integration/gcp_dns_managed_zone/tasks/main.yml
index 3b6c1d6..8c75d72 100644
--- a/tests/integration/gcp_dns_managed_zone/tasks/main.yml
+++ b/tests/integration/gcp_dns_managed_zone/tasks/main.yml
@@ -37,7 +37,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'dns#managedZone'"
 - name: verify that managed_zone was created
   gcp_dns_managed_zone_facts:
       dns_name: test.somewild2.example.com.
@@ -66,7 +65,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'dns#managedZone'"
 #----------------------------------------------------------
 - name: delete a managed zone
   gcp_dns_managed_zone:
diff --git a/tests/integration/gcp_dns_resource_record_set/tasks/main.yml b/tests/integration/gcp_dns_resource_record_set/tasks/main.yml
index cccacb6..4527d4f 100644
--- a/tests/integration/gcp_dns_resource_record_set/tasks/main.yml
+++ b/tests/integration/gcp_dns_resource_record_set/tasks/main.yml
@@ -55,7 +55,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'dns#resourceRecordSet'"
 - name: verify that resource_record_set was created
   gcp_dns_resource_record_set_facts:
       managed_zone: "{{ managed_zone }}"
@@ -88,7 +87,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'dns#resourceRecordSet'"
 #----------------------------------------------------------
 - name: delete a resource record set
   gcp_dns_resource_record_set:
diff --git a/tests/integration/gcp_sql_database/tasks/main.yml b/tests/integration/gcp_sql_database/tasks/main.yml
index 9b300ad..827900e 100644
--- a/tests/integration/gcp_sql_database/tasks/main.yml
+++ b/tests/integration/gcp_sql_database/tasks/main.yml
@@ -52,7 +52,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#database'"
 - name: verify that database was created
   gcp_sql_database_facts:
       instance: "{{ instance }}"
@@ -81,7 +80,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#database'"
 #----------------------------------------------------------
 - name: delete a database
   gcp_sql_database:
diff --git a/tests/integration/gcp_sql_instance/tasks/main.yml b/tests/integration/gcp_sql_instance/tasks/main.yml
index 96aa398..ada068d 100644
--- a/tests/integration/gcp_sql_instance/tasks/main.yml
+++ b/tests/integration/gcp_sql_instance/tasks/main.yml
@@ -47,7 +47,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#instance'"
 - name: verify that instance was created
   gcp_sql_instance_facts:
       project: "{{ gcp_project }}"
@@ -80,7 +79,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#instance'"
 #----------------------------------------------------------
 - name: delete a instance
   gcp_sql_instance:
diff --git a/tests/integration/gcp_sql_user/tasks/main.yml b/tests/integration/gcp_sql_user/tasks/main.yml
index 78e1005..e7c5b2b 100644
--- a/tests/integration/gcp_sql_user/tasks/main.yml
+++ b/tests/integration/gcp_sql_user/tasks/main.yml
@@ -54,7 +54,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'sql#user'"
 - name: verify that user was created
   gcp_sql_user_facts:
       instance: "{{ instance }}"
@@ -84,7 +83,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'sql#user'"
 #----------------------------------------------------------
 - name: delete a user
   gcp_sql_user:
diff --git a/tests/integration/gcp_storage_bucket/tasks/main.yml b/tests/integration/gcp_storage_bucket/tasks/main.yml
index dcf45d5..d49ec89 100644
--- a/tests/integration/gcp_storage_bucket/tasks/main.yml
+++ b/tests/integration/gcp_storage_bucket/tasks/main.yml
@@ -33,7 +33,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'storage#bucket'"
 # ----------------------------------------------------------------------------
 - name: create a bucket that already exists
   gcp_storage_bucket:
@@ -47,7 +46,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'storage#bucket'"
 #----------------------------------------------------------
 - name: delete a bucket
   gcp_storage_bucket:
diff --git a/tests/integration/gcp_storage_bucket_access_control/tasks/main.yml b/tests/integration/gcp_storage_bucket_access_control/tasks/main.yml
index c37b439..301505a 100644
--- a/tests/integration/gcp_storage_bucket_access_control/tasks/main.yml
+++ b/tests/integration/gcp_storage_bucket_access_control/tasks/main.yml
@@ -45,7 +45,6 @@
   assert:
     that:
       - result.changed == true
-      - "result.kind == 'storage#bucketAccessControl'"
 # ----------------------------------------------------------------------------
 - name: create a bucket access control that already exists
   gcp_storage_bucket_access_control:
@@ -61,7 +60,6 @@
   assert:
     that:
       - result.changed == false
-      - "result.kind == 'storage#bucketAccessControl'"
 #----------------------------------------------------------
 - name: delete a bucket access control
   gcp_storage_bucket_access_control: