diff --git a/README.md b/README.md
index 28d52cf..e0aa511 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ ansible-galaxy collection install google.cloud
   * Compute Engine InstanceGroupManager (gcp_compute_instance_group_manager, gcp_compute_instance_group_manager_facts)
   * Compute Engine InterconnectAttachment (gcp_compute_interconnect_attachment, gcp_compute_interconnect_attachment_facts)
   * Compute Engine Network (gcp_compute_network, gcp_compute_network_facts)
+  * Compute Engine NodeGroup (gcp_compute_node_group, gcp_compute_node_group_facts)
   * Compute Engine NodeTemplate (gcp_compute_node_template, gcp_compute_node_template_facts)
   * Compute Engine RegionDisk (gcp_compute_region_disk, gcp_compute_region_disk_facts)
   * Compute Engine Route (gcp_compute_route, gcp_compute_route_facts)
diff --git a/plugins/modules/_gcp_compute_node_group_facts.py b/plugins/modules/_gcp_compute_node_group_facts.py
new file mode 120000
index 0000000..1885148
--- /dev/null
+++ b/plugins/modules/_gcp_compute_node_group_facts.py
@@ -0,0 +1 @@
+gcp_compute_node_group_info.py
\ No newline at end of file
diff --git a/plugins/modules/gcp_compute_node_group.py b/plugins/modules/gcp_compute_node_group.py
new file mode 100644
index 0000000..23c5883
--- /dev/null
+++ b/plugins/modules/gcp_compute_node_group.py
@@ -0,0 +1,416 @@
+#!/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_node_group
+description:
+- Represents a NodeGroup resource to manage a group of sole-tenant nodes.
+short_description: Creates a GCP NodeGroup
+version_added: '2.10'
+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
+  description:
+    description:
+    - An optional textual description of the resource.
+    required: false
+    type: str
+  name:
+    description:
+    - Name of the resource.
+    required: false
+    type: str
+  node_template:
+    description:
+    - The URL of the node template to which this node group belongs.
+    - 'This field represents a link to a NodeTemplate resource in GCP. It can be specified
+      in two ways. First, you can place a dictionary with key ''selfLink'' and value
+      of your resource''s selfLink Alternatively, you can add `register: name-of-resource`
+      to a gcp_compute_node_template task and then set this node_template field to
+      "{{ name-of-resource }}"'
+    required: true
+    type: dict
+  size:
+    description:
+    - The total number of nodes in the node group.
+    required: true
+    type: int
+  zone:
+    description:
+    - Zone where this node group is located .
+    required: true
+    type: str
+  project:
+    description:
+    - The Google Cloud Platform project to use.
+    type: str
+  auth_kind:
+    description:
+    - The type of credential used.
+    type: str
+    required: true
+    choices:
+    - application
+    - machineaccount
+    - serviceaccount
+  service_account_contents:
+    description:
+    - The contents of a Service Account JSON file, either in a dictionary or as a
+      JSON string that represents it.
+    type: jsonarg
+  service_account_file:
+    description:
+    - The path of a Service Account JSON file if serviceaccount is selected as type.
+    type: path
+  service_account_email:
+    description:
+    - An optional service account email address if machineaccount is selected and
+      the user does not wish to use the default email.
+    type: str
+  scopes:
+    description:
+    - Array of scopes to be used
+    type: list
+  env_type:
+    description:
+    - Specifies which Ansible environment you're running this module within.
+    - This should not be set unless you know what you're doing.
+    - This only alters the User Agent string for any API requests.
+    type: str
+notes:
+- 'API Reference: U(https://cloud.google.com/compute/docs/reference/rest/v1/nodeGroups)'
+- 'Sole-Tenant Nodes: U(https://cloud.google.com/compute/docs/nodes/)'
+- for authentication, you can set service_account_file using the c(gcp_service_account_file)
+  env variable.
+- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS)
+  env variable.
+- For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL)
+  env variable.
+- For authentication, you can set auth_kind using the C(GCP_AUTH_KIND) env variable.
+- For authentication, you can set scopes using the C(GCP_SCOPES) env variable.
+- Environment variables values will only be used if the playbook values are not set.
+- The I(service_account_email) and I(service_account_file) options are mutually exclusive.
+'''
+
+EXAMPLES = '''
+- name: create a node template
+  google.cloud.gcp_compute_node_template:
+    name: "{{ resource_name }}"
+    region: us-central1
+    node_type: n1-node-96-624
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: node_template
+
+- name: create a node group
+  google.cloud.gcp_compute_node_group:
+    name: test_object
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    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
+description:
+  description:
+  - An optional textual description of the resource.
+  returned: success
+  type: str
+name:
+  description:
+  - Name of the resource.
+  returned: success
+  type: str
+nodeTemplate:
+  description:
+  - The URL of the node template to which this node group belongs.
+  returned: success
+  type: dict
+size:
+  description:
+  - The total number of nodes in the node group.
+  returned: success
+  type: int
+zone:
+  description:
+  - Zone where this node group is located .
+  returned: success
+  type: str
+'''
+
+################################################################################
+# Imports
+################################################################################
+
+from ansible_collections.google.cloud.plugins.module_utils.gcp_utils import navigate_hash, GcpSession, GcpModule, GcpRequest, 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'),
+            description=dict(type='str'),
+            name=dict(type='str'),
+            node_template=dict(required=True, type='dict'),
+            size=dict(required=True, type='int'),
+            zone=dict(required=True, type='str'),
+        )
+    )
+
+    if not module.params['scopes']:
+        module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
+
+    state = module.params['state']
+    kind = 'compute#NodeGroup'
+
+    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('nodeTemplate') != request.get('nodeTemplate'):
+        node_template_update(module, request, response)
+
+
+def node_template_update(module, request, response):
+    auth = GcpSession(module, 'compute')
+    auth.post(
+        ''.join(["https://www.googleapis.com/compute/v1/", "projects/{project}/zones/{zone}/nodeGroups/{name}/setNodeTemplate"]).format(**module.params),
+        {u'nodeTemplate': replace_resource_dict(module.params.get(u'node_template', {}), 'selfLink')},
+    )
+
+
+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#NodeGroup',
+        u'description': module.params.get('description'),
+        u'name': module.params.get('name'),
+        u'nodeTemplate': replace_resource_dict(module.params.get(u'node_template', {}), 'selfLink'),
+        u'size': module.params.get('size'),
+    }
+    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}/zones/{zone}/nodeGroups/{name}".format(**module.params)
+
+
+def collection(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/nodeGroups".format(**module.params)
+
+
+def create_link(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/nodeGroups?initialNodeCount={size}".format(**module.params)
+
+
+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'description': response.get(u'description'),
+        u'name': response.get(u'name'),
+        u'nodeTemplate': response.get(u'nodeTemplate'),
+        u'size': response.get(u'size'),
+    }
+
+
+def region_selflink(name, params):
+    if name is None:
+        return
+    url = r"https://www.googleapis.com/compute/v1/projects/.*/regions/.*"
+    if not re.match(url, name):
+        name = "https://www.googleapis.com/compute/v1/projects/{project}/regions/%s".format(**params) % name
+    return name
+
+
+def zone_selflink(name, params):
+    if name is None:
+        return
+    url = r"https://www.googleapis.com/compute/v1/projects/.*/zones/.*"
+    if not re.match(url, name):
+        name = "https://www.googleapis.com/compute/v1/projects/{project}/zones/%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/projects/{project}/zones/{zone}/operations/{op_id}"
+    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#NodeGroup')
+
+
+def wait_for_completion(status, op_result, module):
+    op_id = navigate_hash(op_result, ['name'])
+    op_uri = async_op_url(module, {'op_id': op_id})
+    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)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/plugins/modules/gcp_compute_node_group_info.py b/plugins/modules/gcp_compute_node_group_info.py
new file mode 100644
index 0000000..7dc9f99
--- /dev/null
+++ b/plugins/modules/gcp_compute_node_group_info.py
@@ -0,0 +1,228 @@
+#!/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_node_group_info
+description:
+- Gather info for GCP NodeGroup
+- This module was called C(gcp_compute_node_group_facts) before Ansible 2.9. The usage
+  has not changed.
+short_description: Gather info for GCP NodeGroup
+version_added: '2.10'
+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) .
+    type: list
+  zone:
+    description:
+    - Zone where this node group is located .
+    required: true
+    type: str
+  project:
+    description:
+    - The Google Cloud Platform project to use.
+    type: str
+  auth_kind:
+    description:
+    - The type of credential used.
+    type: str
+    required: true
+    choices:
+    - application
+    - machineaccount
+    - serviceaccount
+  service_account_contents:
+    description:
+    - The contents of a Service Account JSON file, either in a dictionary or as a
+      JSON string that represents it.
+    type: jsonarg
+  service_account_file:
+    description:
+    - The path of a Service Account JSON file if serviceaccount is selected as type.
+    type: path
+  service_account_email:
+    description:
+    - An optional service account email address if machineaccount is selected and
+      the user does not wish to use the default email.
+    type: str
+  scopes:
+    description:
+    - Array of scopes to be used
+    type: list
+  env_type:
+    description:
+    - Specifies which Ansible environment you're running this module within.
+    - This should not be set unless you know what you're doing.
+    - This only alters the User Agent string for any API requests.
+    type: str
+notes:
+- for authentication, you can set service_account_file using the c(gcp_service_account_file)
+  env variable.
+- for authentication, you can set service_account_contents using the c(GCP_SERVICE_ACCOUNT_CONTENTS)
+  env variable.
+- For authentication, you can set service_account_email using the C(GCP_SERVICE_ACCOUNT_EMAIL)
+  env variable.
+- For authentication, you can set auth_kind using the C(GCP_AUTH_KIND) env variable.
+- For authentication, you can set scopes using the C(GCP_SCOPES) env variable.
+- Environment variables values will only be used if the playbook values are not set.
+- The I(service_account_email) and I(service_account_file) options are mutually exclusive.
+'''
+
+EXAMPLES = '''
+- name: get info on a node group
+  gcp_compute_node_group_info:
+    zone: us-central1-a
+    filters:
+    - name = test_object
+    project: test_project
+    auth_kind: serviceaccount
+    service_account_file: "/tmp/auth.pem"
+'''
+
+RETURN = '''
+resources:
+  description: List of resources
+  returned: always
+  type: complex
+  contains:
+    creationTimestamp:
+      description:
+      - Creation timestamp in RFC3339 text format.
+      returned: success
+      type: str
+    description:
+      description:
+      - An optional textual description of the resource.
+      returned: success
+      type: str
+    name:
+      description:
+      - Name of the resource.
+      returned: success
+      type: str
+    nodeTemplate:
+      description:
+      - The URL of the node template to which this node group belongs.
+      returned: success
+      type: dict
+    size:
+      description:
+      - The total number of nodes in the node group.
+      returned: success
+      type: int
+    zone:
+      description:
+      - Zone where this node group is located .
+      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'), zone=dict(required=True, type='str')))
+
+    if module._name == 'gcp_compute_node_group_facts':
+        module.deprecate("The 'gcp_compute_node_group_facts' module has been renamed to 'gcp_compute_node_group_info'", version='2.13')
+
+    if not module.params['scopes']:
+        module.params['scopes'] = ['https://www.googleapis.com/auth/compute']
+
+    return_value = {'resources': fetch_list(module, collection(module), query_options(module.params['filters']))}
+    module.exit_json(**return_value)
+
+
+def collection(module):
+    return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/nodeGroups".format(**module.params)
+
+
+def fetch_list(module, link, query):
+    auth = GcpSession(module, 'compute')
+    return auth.list(link, return_if_object, array_name='items', params={'filter': query})
+
+
+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/targets/gcp_appengine_firewall_rule/tasks/autogen.yml b/tests/integration/targets/gcp_appengine_firewall_rule/tasks/autogen.yml
index 5b066d5..561d5c6 100644
--- a/tests/integration/targets/gcp_appengine_firewall_rule/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_appengine_firewall_rule/tasks/autogen.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that firewall_rule was created
-  gcp_appengine_firewall_rule_info:
+  google.cloud.gcp_appengine_firewall_rule_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that firewall_rule was deleted
-  gcp_appengine_firewall_rule_info:
+  google.cloud.gcp_appengine_firewall_rule_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_bigquery_dataset/tasks/autogen.yml b/tests/integration/targets/gcp_bigquery_dataset/tasks/autogen.yml
index 2dcdbc3..ce137d3 100644
--- a/tests/integration/targets/gcp_bigquery_dataset/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_bigquery_dataset/tasks/autogen.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that dataset was created
-  gcp_bigquery_dataset_info:
+  google.cloud.gcp_bigquery_dataset_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that dataset was deleted
-  gcp_bigquery_dataset_info:
+  google.cloud.gcp_bigquery_dataset_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_bigquery_table/tasks/autogen.yml b/tests/integration/targets/gcp_bigquery_table/tasks/autogen.yml
index 598b911..a579d39 100644
--- a/tests/integration/targets/gcp_bigquery_table/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_bigquery_table/tasks/autogen.yml
@@ -54,7 +54,7 @@
     that:
       - result.changed == true
 - name: verify that table was created
-  gcp_bigquery_table_info:
+  google.cloud.gcp_bigquery_table_info:
       dataset: example_dataset
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that table was deleted
-  gcp_bigquery_table_info:
+  google.cloud.gcp_bigquery_table_info:
       dataset: example_dataset
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_cloudfunctions_cloud_function/tasks/autogen.yml b/tests/integration/targets/gcp_cloudfunctions_cloud_function/tasks/autogen.yml
index 95c3d4b..95a308a 100644
--- a/tests/integration/targets/gcp_cloudfunctions_cloud_function/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_cloudfunctions_cloud_function/tasks/autogen.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that cloud_function was created
-  gcp_cloudfunctions_cloud_function_info:
+  google.cloud.gcp_cloudfunctions_cloud_function_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -89,7 +89,7 @@
     that:
       - result.changed == true
 - name: verify that cloud_function was deleted
-  gcp_cloudfunctions_cloud_function_info:
+  google.cloud.gcp_cloudfunctions_cloud_function_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_cloudscheduler_job/tasks/autogen.yml b/tests/integration/targets/gcp_cloudscheduler_job/tasks/autogen.yml
index 40aff8a..664ae1d 100644
--- a/tests/integration/targets/gcp_cloudscheduler_job/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_cloudscheduler_job/tasks/autogen.yml
@@ -56,7 +56,7 @@
     that:
       - result.changed == true
 - name: verify that job was created
-  gcp_cloudscheduler_job_info:
+  google.cloud.gcp_cloudscheduler_job_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -117,7 +117,7 @@
     that:
       - result.changed == true
 - name: verify that job was deleted
-  gcp_cloudscheduler_job_info:
+  google.cloud.gcp_cloudscheduler_job_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_cloudtasks_queue/tasks/autogen.yml b/tests/integration/targets/gcp_cloudtasks_queue/tasks/autogen.yml
index b7290d9..1fe823e 100644
--- a/tests/integration/targets/gcp_cloudtasks_queue/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_cloudtasks_queue/tasks/autogen.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that queue was created
-  gcp_cloudtasks_queue_info:
+  google.cloud.gcp_cloudtasks_queue_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -77,7 +77,7 @@
     that:
       - result.changed == true
 - name: verify that queue was deleted
-  gcp_cloudtasks_queue_info:
+  google.cloud.gcp_cloudtasks_queue_info:
       location: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_compute_address/tasks/autogen.yml b/tests/integration/targets/gcp_compute_address/tasks/autogen.yml
index f090bd6..cf24c9d 100644
--- a/tests/integration/targets/gcp_compute_address/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_address/tasks/autogen.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that address was created
-  gcp_compute_address_info:
+  google.cloud.gcp_compute_address_info:
       filters:
          - name = test-address1
       region: us-west1
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that address was deleted
-  gcp_compute_address_info:
+  google.cloud.gcp_compute_address_info:
       filters:
          - name = test-address1
       region: us-west1
diff --git a/tests/integration/targets/gcp_compute_autoscaler/tasks/autogen.yml b/tests/integration/targets/gcp_compute_autoscaler/tasks/autogen.yml
index c1b92be..4d6cc41 100644
--- a/tests/integration/targets/gcp_compute_autoscaler/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_autoscaler/tasks/autogen.yml
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that autoscaler was created
-  gcp_compute_autoscaler_info:
+  google.cloud.gcp_compute_autoscaler_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -157,7 +157,7 @@
     that:
       - result.changed == true
 - name: verify that autoscaler was deleted
-  gcp_compute_autoscaler_info:
+  google.cloud.gcp_compute_autoscaler_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/tests/integration/targets/gcp_compute_backend_bucket/tasks/autogen.yml b/tests/integration/targets/gcp_compute_backend_bucket/tasks/autogen.yml
index d4ce061..5b0639d 100644
--- a/tests/integration/targets/gcp_compute_backend_bucket/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_backend_bucket/tasks/autogen.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that backend_bucket was created
-  gcp_compute_backend_bucket_info:
+  google.cloud.gcp_compute_backend_bucket_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -94,7 +94,7 @@
     that:
       - result.changed == true
 - name: verify that backend_bucket was deleted
-  gcp_compute_backend_bucket_info:
+  google.cloud.gcp_compute_backend_bucket_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_backend_service/tasks/autogen.yml b/tests/integration/targets/gcp_compute_backend_service/tasks/autogen.yml
index e972126..703134c 100644
--- a/tests/integration/targets/gcp_compute_backend_service/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_backend_service/tasks/autogen.yml
@@ -65,7 +65,7 @@
     that:
       - result.changed == true
 - name: verify that backend_service was created
-  gcp_compute_backend_service_info:
+  google.cloud.gcp_compute_backend_service_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -115,7 +115,7 @@
     that:
       - result.changed == true
 - name: verify that backend_service was deleted
-  gcp_compute_backend_service_info:
+  google.cloud.gcp_compute_backend_service_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_disk/tasks/autogen.yml b/tests/integration/targets/gcp_compute_disk/tasks/autogen.yml
index bb31ea0..07a62ca 100644
--- a/tests/integration/targets/gcp_compute_disk/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_disk/tasks/autogen.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that disk was created
-  gcp_compute_disk_info:
+  google.cloud.gcp_compute_disk_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -91,7 +91,7 @@
     that:
       - result.changed == true
 - name: verify that disk was deleted
-  gcp_compute_disk_info:
+  google.cloud.gcp_compute_disk_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/tests/integration/targets/gcp_compute_firewall/tasks/autogen.yml b/tests/integration/targets/gcp_compute_firewall/tasks/autogen.yml
index 506d118..e844870 100644
--- a/tests/integration/targets/gcp_compute_firewall/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_firewall/tasks/autogen.yml
@@ -52,7 +52,7 @@
     that:
       - result.changed == true
 - name: verify that firewall was created
-  gcp_compute_firewall_info:
+  google.cloud.gcp_compute_firewall_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -110,7 +110,7 @@
     that:
       - result.changed == true
 - name: verify that firewall was deleted
-  gcp_compute_firewall_info:
+  google.cloud.gcp_compute_firewall_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_forwarding_rule/tasks/autogen.yml b/tests/integration/targets/gcp_compute_forwarding_rule/tasks/autogen.yml
index 52ce4b3..255f23d 100644
--- a/tests/integration/targets/gcp_compute_forwarding_rule/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_forwarding_rule/tasks/autogen.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that forwarding_rule was created
-  gcp_compute_forwarding_rule_info:
+  google.cloud.gcp_compute_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -113,7 +113,7 @@
     that:
       - result.changed == true
 - name: verify that forwarding_rule was deleted
-  gcp_compute_forwarding_rule_info:
+  google.cloud.gcp_compute_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/tests/integration/targets/gcp_compute_global_address/tasks/autogen.yml b/tests/integration/targets/gcp_compute_global_address/tasks/autogen.yml
index c898388..38ab68f 100644
--- a/tests/integration/targets/gcp_compute_global_address/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_global_address/tasks/autogen.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that global_address was created
-  gcp_compute_global_address_info:
+  google.cloud.gcp_compute_global_address_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -74,7 +74,7 @@
     that:
       - result.changed == true
 - name: verify that global_address was deleted
-  gcp_compute_global_address_info:
+  google.cloud.gcp_compute_global_address_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_global_forwarding_rule/tasks/autogen.yml b/tests/integration/targets/gcp_compute_global_forwarding_rule/tasks/autogen.yml
index 1b6eb64..0e87821 100644
--- a/tests/integration/targets/gcp_compute_global_forwarding_rule/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_global_forwarding_rule/tasks/autogen.yml
@@ -102,7 +102,7 @@
     that:
       - result.changed == true
 - name: verify that global_forwarding_rule was created
-  gcp_compute_global_forwarding_rule_info:
+  google.cloud.gcp_compute_global_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -150,7 +150,7 @@
     that:
       - result.changed == true
 - name: verify that global_forwarding_rule was deleted
-  gcp_compute_global_forwarding_rule_info:
+  google.cloud.gcp_compute_global_forwarding_rule_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_health_check/tasks/autogen.yml b/tests/integration/targets/gcp_compute_health_check/tasks/autogen.yml
index bfb017c..c8c4535 100644
--- a/tests/integration/targets/gcp_compute_health_check/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_health_check/tasks/autogen.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that health_check was created
-  gcp_compute_health_check_info:
+  google.cloud.gcp_compute_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that health_check was deleted
-  gcp_compute_health_check_info:
+  google.cloud.gcp_compute_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_http_health_check/tasks/autogen.yml b/tests/integration/targets/gcp_compute_http_health_check/tasks/autogen.yml
index 17d8dd8..ee87f79 100644
--- a/tests/integration/targets/gcp_compute_http_health_check/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_http_health_check/tasks/autogen.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that http_health_check was created
-  gcp_compute_http_health_check_info:
+  google.cloud.gcp_compute_http_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that http_health_check was deleted
-  gcp_compute_http_health_check_info:
+  google.cloud.gcp_compute_http_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_https_health_check/tasks/autogen.yml b/tests/integration/targets/gcp_compute_https_health_check/tasks/autogen.yml
index f264819..5554c36 100644
--- a/tests/integration/targets/gcp_compute_https_health_check/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_https_health_check/tasks/autogen.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that https_health_check was created
-  gcp_compute_https_health_check_info:
+  google.cloud.gcp_compute_https_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that https_health_check was deleted
-  gcp_compute_https_health_check_info:
+  google.cloud.gcp_compute_https_health_check_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_image/tasks/autogen.yml b/tests/integration/targets/gcp_compute_image/tasks/autogen.yml
index 5e4a2a7..a33dda8 100644
--- a/tests/integration/targets/gcp_compute_image/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_image/tasks/autogen.yml
@@ -45,7 +45,7 @@
     that:
       - result.changed == true
 - name: verify that image was created
-  gcp_compute_image_info:
+  google.cloud.gcp_compute_image_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -87,7 +87,7 @@
     that:
       - result.changed == true
 - name: verify that image was deleted
-  gcp_compute_image_info:
+  google.cloud.gcp_compute_image_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_instance/tasks/autogen.yml b/tests/integration/targets/gcp_compute_instance/tasks/autogen.yml
index 2fa9c66..64eb3c9 100644
--- a/tests/integration/targets/gcp_compute_instance/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_instance/tasks/autogen.yml
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_compute_instance_info:
+  google.cloud.gcp_compute_instance_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -171,7 +171,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_compute_instance_info:
+  google.cloud.gcp_compute_instance_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/tests/integration/targets/gcp_compute_instance_group/tasks/autogen.yml b/tests/integration/targets/gcp_compute_instance_group/tasks/autogen.yml
index 580e180..4a3a92c 100644
--- a/tests/integration/targets/gcp_compute_instance_group/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_instance_group/tasks/autogen.yml
@@ -52,7 +52,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group was created
-  gcp_compute_instance_group_info:
+  google.cloud.gcp_compute_instance_group_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group was deleted
-  gcp_compute_instance_group_info:
+  google.cloud.gcp_compute_instance_group_info:
       filters:
          - name = {{ resource_name }}
       zone: us-central1-a
diff --git a/tests/integration/targets/gcp_compute_instance_group_manager/tasks/autogen.yml b/tests/integration/targets/gcp_compute_instance_group_manager/tasks/autogen.yml
index 9dd047b..7e56ecf 100644
--- a/tests/integration/targets/gcp_compute_instance_group_manager/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_instance_group_manager/tasks/autogen.yml
@@ -80,7 +80,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group_manager was created
-  gcp_compute_instance_group_manager_info:
+  google.cloud.gcp_compute_instance_group_manager_info:
       filters:
          - name = {{ resource_name }}
       zone: us-west1-a
@@ -129,7 +129,7 @@
     that:
       - result.changed == true
 - name: verify that instance_group_manager was deleted
-  gcp_compute_instance_group_manager_info:
+  google.cloud.gcp_compute_instance_group_manager_info:
       filters:
          - name = {{ resource_name }}
       zone: us-west1-a
diff --git a/tests/integration/targets/gcp_compute_instance_template/tasks/autogen.yml b/tests/integration/targets/gcp_compute_instance_template/tasks/autogen.yml
index f4e3ea6..d52c6f2 100644
--- a/tests/integration/targets/gcp_compute_instance_template/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_instance_template/tasks/autogen.yml
@@ -77,7 +77,7 @@
     that:
       - result.changed == true
 - name: verify that instance_template was created
-  gcp_compute_instance_template_info:
+  google.cloud.gcp_compute_instance_template_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -143,7 +143,7 @@
     that:
       - result.changed == true
 - name: verify that instance_template was deleted
-  gcp_compute_instance_template_info:
+  google.cloud.gcp_compute_instance_template_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_network/tasks/autogen.yml b/tests/integration/targets/gcp_compute_network/tasks/autogen.yml
index 68b3d51..b3cc90e 100644
--- a/tests/integration/targets/gcp_compute_network/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_network/tasks/autogen.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that network was created
-  gcp_compute_network_info:
+  google.cloud.gcp_compute_network_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -78,7 +78,7 @@
     that:
       - result.changed == true
 - name: verify that network was deleted
-  gcp_compute_network_info:
+  google.cloud.gcp_compute_network_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_node_group/aliases b/tests/integration/targets/gcp_compute_node_group/aliases
new file mode 100644
index 0000000..9812f01
--- /dev/null
+++ b/tests/integration/targets/gcp_compute_node_group/aliases
@@ -0,0 +1,2 @@
+cloud/gcp
+unsupported
diff --git a/tests/integration/targets/gcp_compute_node_group/defaults/main.yml b/tests/integration/targets/gcp_compute_node_group/defaults/main.yml
new file mode 100644
index 0000000..ba66644
--- /dev/null
+++ b/tests/integration/targets/gcp_compute_node_group/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+resource_name: "{{ resource_prefix }}"
diff --git a/tests/integration/targets/gcp_compute_node_group/meta/main.yml b/tests/integration/targets/gcp_compute_node_group/meta/main.yml
new file mode 100644
index 0000000..e69de29
diff --git a/tests/integration/targets/gcp_compute_node_group/tasks/autogen.yml b/tests/integration/targets/gcp_compute_node_group/tasks/autogen.yml
new file mode 100644
index 0000000..3a6a6ed
--- /dev/null
+++ b/tests/integration/targets/gcp_compute_node_group/tasks/autogen.yml
@@ -0,0 +1,148 @@
+---
+# ----------------------------------------------------------------------------
+#
+#     ***     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 node template
+  google.cloud.gcp_compute_node_template:
+    name: "{{ resource_name }}"
+    region: us-central1
+    node_type: n1-node-96-624
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: present
+  register: node_template
+- name: delete a node group
+  google.cloud.gcp_compute_node_group:
+    name: "{{ resource_name }}"
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+#----------------------------------------------------------
+- name: create a node group
+  google.cloud.gcp_compute_node_group:
+    name: "{{ resource_name }}"
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    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 node_group was created
+  google.cloud.gcp_compute_node_group_info:
+      filters:
+         - name = {{ resource_name }}
+      zone: us-central1-a
+      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 node group that already exists
+  google.cloud.gcp_compute_node_group:
+    name: "{{ resource_name }}"
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    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 node group
+  google.cloud.gcp_compute_node_group:
+    name: "{{ resource_name }}"
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    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 node_group was deleted
+  google.cloud.gcp_compute_node_group_info:
+      filters:
+         - name = {{ resource_name }}
+      zone: us-central1-a
+      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 node group that does not exist
+  google.cloud.gcp_compute_node_group:
+    name: "{{ resource_name }}"
+    zone: us-central1-a
+    description: example group for ansible
+    size: 1
+    node_template: "{{ node_template }}"
+    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 node template
+  google.cloud.gcp_compute_node_template:
+    name: "{{ resource_name }}"
+    region: us-central1
+    node_type: n1-node-96-624
+    project: "{{ gcp_project }}"
+    auth_kind: "{{ gcp_cred_kind }}"
+    service_account_file: "{{ gcp_cred_file }}"
+    state: absent
+  register: node_template
+  ignore_errors: true
diff --git a/tests/integration/targets/gcp_compute_node_group/tasks/main.yml b/tests/integration/targets/gcp_compute_node_group/tasks/main.yml
new file mode 100644
index 0000000..45d6e49
--- /dev/null
+++ b/tests/integration/targets/gcp_compute_node_group/tasks/main.yml
@@ -0,0 +1,2 @@
+---
+- include_tasks: autogen.yml
diff --git a/tests/integration/targets/gcp_compute_node_template/tasks/autogen.yml b/tests/integration/targets/gcp_compute_node_template/tasks/autogen.yml
index 120436f..09dd3d8 100644
--- a/tests/integration/targets/gcp_compute_node_template/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_node_template/tasks/autogen.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that node_template was created
-  gcp_compute_node_template_info:
+  google.cloud.gcp_compute_node_template_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
@@ -83,7 +83,7 @@
     that:
       - result.changed == true
 - name: verify that node_template was deleted
-  gcp_compute_node_template_info:
+  google.cloud.gcp_compute_node_template_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
diff --git a/tests/integration/targets/gcp_compute_region_disk/tasks/autogen.yml b/tests/integration/targets/gcp_compute_region_disk/tasks/autogen.yml
index 2292e01..ee65f31 100644
--- a/tests/integration/targets/gcp_compute_region_disk/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_region_disk/tasks/autogen.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that region_disk was created
-  gcp_compute_region_disk_info:
+  google.cloud.gcp_compute_region_disk_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
@@ -103,7 +103,7 @@
     that:
       - result.changed == true
 - name: verify that region_disk was deleted
-  gcp_compute_region_disk_info:
+  google.cloud.gcp_compute_region_disk_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
diff --git a/tests/integration/targets/gcp_compute_route/tasks/autogen.yml b/tests/integration/targets/gcp_compute_route/tasks/autogen.yml
index f13b0ab..28cd144 100644
--- a/tests/integration/targets/gcp_compute_route/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_route/tasks/autogen.yml
@@ -54,7 +54,7 @@
     that:
       - result.changed == true
 - name: verify that route was created
-  gcp_compute_route_info:
+  google.cloud.gcp_compute_route_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that route was deleted
-  gcp_compute_route_info:
+  google.cloud.gcp_compute_route_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_router/tasks/autogen.yml b/tests/integration/targets/gcp_compute_router/tasks/autogen.yml
index c1a903b..bfb5b00 100644
--- a/tests/integration/targets/gcp_compute_router/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_router/tasks/autogen.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that router was created
-  gcp_compute_router_info:
+  google.cloud.gcp_compute_router_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
@@ -123,7 +123,7 @@
     that:
       - result.changed == true
 - name: verify that router was deleted
-  gcp_compute_router_info:
+  google.cloud.gcp_compute_router_info:
       filters:
          - name = {{ resource_name }}
       region: us-central1
diff --git a/tests/integration/targets/gcp_compute_snapshot/tasks/autogen.yml b/tests/integration/targets/gcp_compute_snapshot/tasks/autogen.yml
index 796ebaf..703c4d3 100644
--- a/tests/integration/targets/gcp_compute_snapshot/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_snapshot/tasks/autogen.yml
@@ -51,7 +51,7 @@
     that:
       - result.changed == true
 - name: verify that snapshot was created
-  gcp_compute_snapshot_info:
+  google.cloud.gcp_compute_snapshot_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -99,7 +99,7 @@
     that:
       - result.changed == true
 - name: verify that snapshot was deleted
-  gcp_compute_snapshot_info:
+  google.cloud.gcp_compute_snapshot_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_ssl_certificate/tasks/autogen.yml b/tests/integration/targets/gcp_compute_ssl_certificate/tasks/autogen.yml
index 7b771c1..280fb5e 100644
--- a/tests/integration/targets/gcp_compute_ssl_certificate/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_ssl_certificate/tasks/autogen.yml
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_certificate was created
-  gcp_compute_ssl_certificate_info:
+  google.cloud.gcp_compute_ssl_certificate_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -174,7 +174,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_certificate was deleted
-  gcp_compute_ssl_certificate_info:
+  google.cloud.gcp_compute_ssl_certificate_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_ssl_policy/tasks/autogen.yml b/tests/integration/targets/gcp_compute_ssl_policy/tasks/autogen.yml
index 9cb8777..70380dd 100644
--- a/tests/integration/targets/gcp_compute_ssl_policy/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_ssl_policy/tasks/autogen.yml
@@ -44,7 +44,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_policy was created
-  gcp_compute_ssl_policy_info:
+  google.cloud.gcp_compute_ssl_policy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -94,7 +94,7 @@
     that:
       - result.changed == true
 - name: verify that ssl_policy was deleted
-  gcp_compute_ssl_policy_info:
+  google.cloud.gcp_compute_ssl_policy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_subnetwork/tasks/autogen.yml b/tests/integration/targets/gcp_compute_subnetwork/tasks/autogen.yml
index a560df5..7a3a2f4 100644
--- a/tests/integration/targets/gcp_compute_subnetwork/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_subnetwork/tasks/autogen.yml
@@ -49,7 +49,7 @@
     that:
       - result.changed == true
 - name: verify that subnetwork was created
-  gcp_compute_subnetwork_info:
+  google.cloud.gcp_compute_subnetwork_info:
       filters:
          - name = ansiblenet
       region: us-west1
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that subnetwork was deleted
-  gcp_compute_subnetwork_info:
+  google.cloud.gcp_compute_subnetwork_info:
       filters:
          - name = ansiblenet
       region: us-west1
diff --git a/tests/integration/targets/gcp_compute_target_http_proxy/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_http_proxy/tasks/autogen.yml
index 85f5a0c..99358c4 100644
--- a/tests/integration/targets/gcp_compute_target_http_proxy/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_http_proxy/tasks/autogen.yml
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that target_http_proxy was created
-  gcp_compute_target_http_proxy_info:
+  google.cloud.gcp_compute_target_http_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -121,7 +121,7 @@
     that:
       - result.changed == true
 - name: verify that target_http_proxy was deleted
-  gcp_compute_target_http_proxy_info:
+  google.cloud.gcp_compute_target_http_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_target_https_proxy/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_https_proxy/tasks/autogen.yml
index ca1c243..1985bcd 100644
--- a/tests/integration/targets/gcp_compute_target_https_proxy/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_https_proxy/tasks/autogen.yml
@@ -116,7 +116,7 @@
     that:
       - result.changed == true
 - name: verify that target_https_proxy was created
-  gcp_compute_target_https_proxy_info:
+  google.cloud.gcp_compute_target_https_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -162,7 +162,7 @@
     that:
       - result.changed == true
 - name: verify that target_https_proxy was deleted
-  gcp_compute_target_https_proxy_info:
+  google.cloud.gcp_compute_target_https_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_target_pool/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_pool/tasks/autogen.yml
index 8fa586f..9bad8a9 100644
--- a/tests/integration/targets/gcp_compute_target_pool/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_pool/tasks/autogen.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that target_pool was created
-  gcp_compute_target_pool_info:
+  google.cloud.gcp_compute_target_pool_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -79,7 +79,7 @@
     that:
       - result.changed == true
 - name: verify that target_pool was deleted
-  gcp_compute_target_pool_info:
+  google.cloud.gcp_compute_target_pool_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/tests/integration/targets/gcp_compute_target_ssl_proxy/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_ssl_proxy/tasks/autogen.yml
index 3688121..0c852df 100644
--- a/tests/integration/targets/gcp_compute_target_ssl_proxy/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_ssl_proxy/tasks/autogen.yml
@@ -111,7 +111,7 @@
     that:
       - result.changed == true
 - name: verify that target_ssl_proxy was created
-  gcp_compute_target_ssl_proxy_info:
+  google.cloud.gcp_compute_target_ssl_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -157,7 +157,7 @@
     that:
       - result.changed == true
 - name: verify that target_ssl_proxy was deleted
-  gcp_compute_target_ssl_proxy_info:
+  google.cloud.gcp_compute_target_ssl_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_target_tcp_proxy/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_tcp_proxy/tasks/autogen.yml
index c0becb2..c2d6a86 100644
--- a/tests/integration/targets/gcp_compute_target_tcp_proxy/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_tcp_proxy/tasks/autogen.yml
@@ -76,7 +76,7 @@
     that:
       - result.changed == true
 - name: verify that target_tcp_proxy was created
-  gcp_compute_target_tcp_proxy_info:
+  google.cloud.gcp_compute_target_tcp_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -120,7 +120,7 @@
     that:
       - result.changed == true
 - name: verify that target_tcp_proxy was deleted
-  gcp_compute_target_tcp_proxy_info:
+  google.cloud.gcp_compute_target_tcp_proxy_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_target_vpn_gateway/tasks/autogen.yml b/tests/integration/targets/gcp_compute_target_vpn_gateway/tasks/autogen.yml
index 900878f..5e39f6d 100644
--- a/tests/integration/targets/gcp_compute_target_vpn_gateway/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_target_vpn_gateway/tasks/autogen.yml
@@ -55,7 +55,7 @@
     that:
       - result.changed == true
 - name: verify that target_vpn_gateway was created
-  gcp_compute_target_vpn_gateway_info:
+  google.cloud.gcp_compute_target_vpn_gateway_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that target_vpn_gateway was deleted
-  gcp_compute_target_vpn_gateway_info:
+  google.cloud.gcp_compute_target_vpn_gateway_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/tests/integration/targets/gcp_compute_url_map/tasks/autogen.yml b/tests/integration/targets/gcp_compute_url_map/tasks/autogen.yml
index a52491b..f39671c 100644
--- a/tests/integration/targets/gcp_compute_url_map/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_url_map/tasks/autogen.yml
@@ -70,7 +70,7 @@
     that:
       - result.changed == true
 - name: verify that url_map was created
-  gcp_compute_url_map_info:
+  google.cloud.gcp_compute_url_map_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
@@ -112,7 +112,7 @@
     that:
       - result.changed == true
 - name: verify that url_map was deleted
-  gcp_compute_url_map_info:
+  google.cloud.gcp_compute_url_map_info:
       filters:
          - name = {{ resource_name }}
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_compute_vpn_tunnel/tasks/autogen.yml b/tests/integration/targets/gcp_compute_vpn_tunnel/tasks/autogen.yml
index 1ed8491..b28b7a2 100644
--- a/tests/integration/targets/gcp_compute_vpn_tunnel/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_compute_vpn_tunnel/tasks/autogen.yml
@@ -78,7 +78,7 @@
     that:
       - result.changed == true
 - name: verify that vpn_tunnel was created
-  gcp_compute_vpn_tunnel_info:
+  google.cloud.gcp_compute_vpn_tunnel_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
@@ -127,7 +127,7 @@
     that:
       - result.changed == true
 - name: verify that vpn_tunnel was deleted
-  gcp_compute_vpn_tunnel_info:
+  google.cloud.gcp_compute_vpn_tunnel_info:
       filters:
          - name = {{ resource_name }}
       region: us-west1
diff --git a/tests/integration/targets/gcp_container_cluster/tasks/autogen.yml b/tests/integration/targets/gcp_container_cluster/tasks/autogen.yml
index 4e448ea..b0c69a3 100644
--- a/tests/integration/targets/gcp_container_cluster/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_container_cluster/tasks/autogen.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that cluster was created
-  gcp_container_cluster_info:
+  google.cloud.gcp_container_cluster_info:
       location: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -105,7 +105,7 @@
     that:
       - result.changed == true
 - name: verify that cluster was deleted
-  gcp_container_cluster_info:
+  google.cloud.gcp_container_cluster_info:
       location: us-central1-a
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_container_node_pool/tasks/autogen.yml b/tests/integration/targets/gcp_container_node_pool/tasks/autogen.yml
index f288981..85cc428 100644
--- a/tests/integration/targets/gcp_container_node_pool/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_container_node_pool/tasks/autogen.yml
@@ -50,7 +50,7 @@
     that:
       - result.changed == true
 - name: verify that node_pool was created
-  gcp_container_node_pool_info:
+  google.cloud.gcp_container_node_pool_info:
       cluster: "{{ cluster }}"
       location: us-central1-a
       project: "{{ gcp_project }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that node_pool was deleted
-  gcp_container_node_pool_info:
+  google.cloud.gcp_container_node_pool_info:
       cluster: "{{ cluster }}"
       location: us-central1-a
       project: "{{ gcp_project }}"
diff --git a/tests/integration/targets/gcp_dns_managed_zone/tasks/autogen.yml b/tests/integration/targets/gcp_dns_managed_zone/tasks/autogen.yml
index c564b02..6373750 100644
--- a/tests/integration/targets/gcp_dns_managed_zone/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_dns_managed_zone/tasks/autogen.yml
@@ -38,7 +38,7 @@
     that:
       - result.changed == true
 - name: verify that managed_zone was created
-  gcp_dns_managed_zone_info:
+  google.cloud.gcp_dns_managed_zone_info:
       dns_name: test.somewild2.example.com.
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -81,7 +81,7 @@
     that:
       - result.changed == true
 - name: verify that managed_zone was deleted
-  gcp_dns_managed_zone_info:
+  google.cloud.gcp_dns_managed_zone_info:
       dns_name: test.somewild2.example.com.
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_dns_resource_record_set/tasks/autogen.yml b/tests/integration/targets/gcp_dns_resource_record_set/tasks/autogen.yml
index b195257..f190966 100644
--- a/tests/integration/targets/gcp_dns_resource_record_set/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_dns_resource_record_set/tasks/autogen.yml
@@ -56,7 +56,7 @@
     that:
       - result.changed == true
 - name: verify that resource_record_set was created
-  gcp_dns_resource_record_set_info:
+  google.cloud.gcp_dns_resource_record_set_info:
       managed_zone: "{{ managed_zone }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -107,7 +107,7 @@
     that:
       - result.changed == true
 - name: verify that resource_record_set was deleted
-  gcp_dns_resource_record_set_info:
+  google.cloud.gcp_dns_resource_record_set_info:
       managed_zone: "{{ managed_zone }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_filestore_instance/tasks/autogen.yml b/tests/integration/targets/gcp_filestore_instance/tasks/autogen.yml
index 1357b0a..c9f1d17 100644
--- a/tests/integration/targets/gcp_filestore_instance/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_filestore_instance/tasks/autogen.yml
@@ -52,7 +52,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_filestore_instance_info:
+  google.cloud.gcp_filestore_instance_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -109,7 +109,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_filestore_instance_info:
+  google.cloud.gcp_filestore_instance_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_iam_role/tasks/autogen.yml b/tests/integration/targets/gcp_iam_role/tasks/autogen.yml
index 6b4f269..7d28873 100644
--- a/tests/integration/targets/gcp_iam_role/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_iam_role/tasks/autogen.yml
@@ -46,7 +46,7 @@
     that:
       - result.changed == true
 - name: verify that role was created
-  gcp_iam_role_info:
+  google.cloud.gcp_iam_role_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that role was deleted
-  gcp_iam_role_info:
+  google.cloud.gcp_iam_role_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_iam_service_account/tasks/autogen.yml b/tests/integration/targets/gcp_iam_service_account/tasks/autogen.yml
index 25ac355..1d9f951 100644
--- a/tests/integration/targets/gcp_iam_service_account/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_iam_service_account/tasks/autogen.yml
@@ -36,7 +36,7 @@
     that:
       - result.changed == true
 - name: verify that service_account was created
-  gcp_iam_service_account_info:
+  google.cloud.gcp_iam_service_account_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -76,7 +76,7 @@
     that:
       - result.changed == true
 - name: verify that service_account was deleted
-  gcp_iam_service_account_info:
+  google.cloud.gcp_iam_service_account_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_mlengine_model/tasks/autogen.yml b/tests/integration/targets/gcp_mlengine_model/tasks/autogen.yml
index 018f60b..2defa6c 100644
--- a/tests/integration/targets/gcp_mlengine_model/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_mlengine_model/tasks/autogen.yml
@@ -40,7 +40,7 @@
     that:
       - result.changed == true
 - name: verify that model was created
-  gcp_mlengine_model_info:
+  google.cloud.gcp_mlengine_model_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that model was deleted
-  gcp_mlengine_model_info:
+  google.cloud.gcp_mlengine_model_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_mlengine_version/tasks/autogen.yml b/tests/integration/targets/gcp_mlengine_version/tasks/autogen.yml
index 0f73d39..ad4def7 100644
--- a/tests/integration/targets/gcp_mlengine_version/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_mlengine_version/tasks/autogen.yml
@@ -57,7 +57,7 @@
     that:
       - result.changed == true
 - name: verify that version was created
-  gcp_mlengine_version_info:
+  google.cloud.gcp_mlengine_version_info:
       model: "{{ model }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -106,7 +106,7 @@
     that:
       - result.changed == true
 - name: verify that version was deleted
-  gcp_mlengine_version_info:
+  google.cloud.gcp_mlengine_version_info:
       model: "{{ model }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_pubsub_subscription/tasks/autogen.yml b/tests/integration/targets/gcp_pubsub_subscription/tasks/autogen.yml
index 7db0b76..da8fde6 100644
--- a/tests/integration/targets/gcp_pubsub_subscription/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_pubsub_subscription/tasks/autogen.yml
@@ -46,7 +46,7 @@
     that:
       - result.changed == true
 - name: verify that subscription was created
-  gcp_pubsub_subscription_info:
+  google.cloud.gcp_pubsub_subscription_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -88,7 +88,7 @@
     that:
       - result.changed == true
 - name: verify that subscription was deleted
-  gcp_pubsub_subscription_info:
+  google.cloud.gcp_pubsub_subscription_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_pubsub_topic/tasks/autogen.yml b/tests/integration/targets/gcp_pubsub_topic/tasks/autogen.yml
index 17683ea..9463482 100644
--- a/tests/integration/targets/gcp_pubsub_topic/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_pubsub_topic/tasks/autogen.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that topic was created
-  gcp_pubsub_topic_info:
+  google.cloud.gcp_pubsub_topic_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -72,7 +72,7 @@
     that:
       - result.changed == true
 - name: verify that topic was deleted
-  gcp_pubsub_topic_info:
+  google.cloud.gcp_pubsub_topic_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_redis_instance/tasks/autogen.yml b/tests/integration/targets/gcp_redis_instance/tasks/autogen.yml
index 6effd6e..af88e0b 100644
--- a/tests/integration/targets/gcp_redis_instance/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_redis_instance/tasks/autogen.yml
@@ -62,7 +62,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_redis_instance_info:
+  google.cloud.gcp_redis_instance_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -121,7 +121,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_redis_instance_info:
+  google.cloud.gcp_redis_instance_info:
       region: us-central1
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_resourcemanager_project/tasks/autogen.yml b/tests/integration/targets/gcp_resourcemanager_project/tasks/autogen.yml
index 1293ddb..ea1e45c 100644
--- a/tests/integration/targets/gcp_resourcemanager_project/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_resourcemanager_project/tasks/autogen.yml
@@ -40,7 +40,7 @@
     that:
       - result.changed == true
 - name: verify that project was created
-  gcp_resourcemanager_project_info:
+  google.cloud.gcp_resourcemanager_project_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -84,7 +84,7 @@
     that:
       - result.changed == true
 - name: verify that project was deleted
-  gcp_resourcemanager_project_info:
+  google.cloud.gcp_resourcemanager_project_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_sourcerepo_repository/tasks/autogen.yml b/tests/integration/targets/gcp_sourcerepo_repository/tasks/autogen.yml
index 519eacd..f6bd018 100644
--- a/tests/integration/targets/gcp_sourcerepo_repository/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_sourcerepo_repository/tasks/autogen.yml
@@ -34,7 +34,7 @@
     that:
       - result.changed == true
 - name: verify that repository was created
-  gcp_sourcerepo_repository_info:
+  google.cloud.gcp_sourcerepo_repository_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -72,7 +72,7 @@
     that:
       - result.changed == true
 - name: verify that repository was deleted
-  gcp_sourcerepo_repository_info:
+  google.cloud.gcp_sourcerepo_repository_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_spanner_database/tasks/autogen.yml b/tests/integration/targets/gcp_spanner_database/tasks/autogen.yml
index 8c9af8d..8a0f05b 100644
--- a/tests/integration/targets/gcp_spanner_database/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_spanner_database/tasks/autogen.yml
@@ -49,7 +49,7 @@
     that:
       - result.changed == true
 - name: verify that database was created
-  gcp_spanner_database_info:
+  google.cloud.gcp_spanner_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -90,7 +90,7 @@
     that:
       - result.changed == true
 - name: verify that database was deleted
-  gcp_spanner_database_info:
+  google.cloud.gcp_spanner_database_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_spanner_instance/tasks/autogen.yml b/tests/integration/targets/gcp_spanner_instance/tasks/autogen.yml
index 0b14e46..2dac982 100644
--- a/tests/integration/targets/gcp_spanner_instance/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_spanner_instance/tasks/autogen.yml
@@ -44,7 +44,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_spanner_instance_info:
+  google.cloud.gcp_spanner_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -92,7 +92,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_spanner_instance_info:
+  google.cloud.gcp_spanner_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_sql_database/tasks/autogen.yml b/tests/integration/targets/gcp_sql_database/tasks/autogen.yml
index ecf84cd..38ed665 100644
--- a/tests/integration/targets/gcp_sql_database/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_sql_database/tasks/autogen.yml
@@ -53,7 +53,7 @@
     that:
       - result.changed == true
 - name: verify that database was created
-  gcp_sql_database_info:
+  google.cloud.gcp_sql_database_info:
       instance: "{{ instance.name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -96,7 +96,7 @@
     that:
       - result.changed == true
 - name: verify that database was deleted
-  gcp_sql_database_info:
+  google.cloud.gcp_sql_database_info:
       instance: "{{ instance.name }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_sql_instance/tasks/autogen.yml b/tests/integration/targets/gcp_sql_instance/tasks/autogen.yml
index f4cc7a0..2327e01 100644
--- a/tests/integration/targets/gcp_sql_instance/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_sql_instance/tasks/autogen.yml
@@ -48,7 +48,7 @@
     that:
       - result.changed == true
 - name: verify that instance was created
-  gcp_sql_instance_info:
+  google.cloud.gcp_sql_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that instance was deleted
-  gcp_sql_instance_info:
+  google.cloud.gcp_sql_instance_info:
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
       service_account_file: "{{ gcp_cred_file }}"
diff --git a/tests/integration/targets/gcp_sql_user/tasks/autogen.yml b/tests/integration/targets/gcp_sql_user/tasks/autogen.yml
index 0b53c25..b49e85d 100644
--- a/tests/integration/targets/gcp_sql_user/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_sql_user/tasks/autogen.yml
@@ -55,7 +55,7 @@
     that:
       - result.changed == true
 - name: verify that user was created
-  gcp_sql_user_info:
+  google.cloud.gcp_sql_user_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -100,7 +100,7 @@
     that:
       - result.changed == true
 - name: verify that user was deleted
-  gcp_sql_user_info:
+  google.cloud.gcp_sql_user_info:
       instance: "{{ instance }}"
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
diff --git a/tests/integration/targets/gcp_tpu_node/tasks/autogen.yml b/tests/integration/targets/gcp_tpu_node/tasks/autogen.yml
index d0b1944..61a7f5d 100644
--- a/tests/integration/targets/gcp_tpu_node/tasks/autogen.yml
+++ b/tests/integration/targets/gcp_tpu_node/tasks/autogen.yml
@@ -42,7 +42,7 @@
     that:
       - result.changed == true
 - name: verify that node was created
-  gcp_tpu_node_info:
+  google.cloud.gcp_tpu_node_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"
@@ -89,7 +89,7 @@
     that:
       - result.changed == true
 - name: verify that node was deleted
-  gcp_tpu_node_info:
+  google.cloud.gcp_tpu_node_info:
       zone: us-central1-b
       project: "{{ gcp_project }}"
       auth_kind: "{{ gcp_cred_kind }}"