diff --git a/google/data_source_google_active_folder_test.go b/google/data_source_google_active_folder_test.go
index 6a209a91e20..b887ccbde83 100644
--- a/google/data_source_google_active_folder_test.go
+++ b/google/data_source_google_active_folder_test.go
@@ -90,5 +90,6 @@ data "google_active_folder" "my_folder" {
   parent       = google_folder.foobar.parent
   display_name = google_folder.foobar.display_name
 }
+
 `, parent, displayName)
 }
diff --git a/google/data_source_google_compute_router_test.go b/google/data_source_google_compute_router_test.go
index 020a0c62757..4d88a53386c 100644
--- a/google/data_source_google_compute_router_test.go
+++ b/google/data_source_google_compute_router_test.go
@@ -31,21 +31,19 @@ func TestAccDataSourceComputeRouter(t *testing.T) {
 func testAccDataSourceComputeRouterConfig(name string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+    name    = "%s"
+    auto_create_subnetworks = false
 }
-
 resource "google_compute_router" "foobar" {
-  name    = "%s"
-  network = google_compute_network.foobar.name
-  bgp {
-    asn = 64514
-  }
+    name    = "%s"
+    network = "${google_compute_network.foobar.name}"
+    bgp {
+        asn = 64514
+    }
 }
-
 data "google_compute_router" "myrouter" {
-  name    = google_compute_router.foobar.name
-  network = google_compute_network.foobar.name
+    name    = "${google_compute_router.foobar.name}"
+	network	= "${google_compute_network.foobar.name}"
 }
 `, name, name)
 }
diff --git a/google/data_source_google_iam_policy.go b/google/data_source_google_iam_policy.go
index 637d77526d5..760f629670c 100644
--- a/google/data_source_google_iam_policy.go
+++ b/google/data_source_google_iam_policy.go
@@ -2,11 +2,13 @@ package google
 
 import (
 	"encoding/json"
+	"regexp"
 	"sort"
 	"strconv"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/hashcode"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"google.golang.org/api/cloudresourcemanager/v1"
 )
 
@@ -38,8 +40,11 @@ func dataSourceGoogleIamPolicy() *schema.Resource {
 						"members": {
 							Type:     schema.TypeSet,
 							Required: true,
-							Elem:     &schema.Schema{Type: schema.TypeString},
-							Set:      schema.HashString,
+							Elem: &schema.Schema{
+								Type:         schema.TypeString,
+								ValidateFunc: validation.StringDoesNotMatch(regexp.MustCompile("^deleted:"), "Terraform does not support IAM policies for deleted principals"),
+							},
+							Set: schema.HashString,
 						},
 					},
 				},
diff --git a/google/data_source_storage_object_signed_url_test.go b/google/data_source_storage_object_signed_url_test.go
index 1dce1f6ef1f..3b4ececefc8 100644
--- a/google/data_source_storage_object_signed_url_test.go
+++ b/google/data_source_storage_object_signed_url_test.go
@@ -28,8 +28,7 @@ const fakeCredentials = `{
   "token_uri": "https://accounts.google.com/o/oauth2/token",
   "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
   "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/user%40gcp-project.iam.gserviceaccount.com"
-}
-`
+}`
 
 // The following values are derived from the output of the `gsutil signurl` command.
 // i.e.
diff --git a/google/resource_access_context_manager_service_perimeter_test.go b/google/resource_access_context_manager_service_perimeter_test.go
index e018b95ea23..9039a1540e3 100644
--- a/google/resource_access_context_manager_service_perimeter_test.go
+++ b/google/resource_access_context_manager_service_perimeter_test.go
@@ -139,7 +139,7 @@ resource "google_access_context_manager_service_perimeter" "test-access" {
   perimeter_type = "PERIMETER_TYPE_REGULAR"
   status {
     restricted_services = ["bigquery.googleapis.com"]
-    access_levels       = [google_access_context_manager_access_level.test-access.name]
+    access_levels = ["${google_access_context_manager_access_level.test-access.name}"]
   }
 }
 `, org, policyTitle, levelTitleName, levelTitleName, perimeterTitleName, perimeterTitleName)
diff --git a/google/resource_app_engine_application_test.go b/google/resource_app_engine_application_test.go
index 39a5e811c66..81074342b71 100644
--- a/google/resource_app_engine_application_test.go
+++ b/google/resource_app_engine_application_test.go
@@ -53,12 +53,11 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_app_engine_application" "acceptance" {
-  project        = google_project.acceptance.project_id
-  auth_domain    = "hashicorptest.com"
-  location_id    = "us-central"
-  serving_status = "SERVING"
-}
-`, pid, pid, org)
+  project         = "${google_project.acceptance.project_id}"
+  auth_domain     = "hashicorptest.com"
+  location_id     = "us-central"
+  serving_status  = "SERVING"
+}`, pid, pid, org)
 }
 
 func testAccAppEngineApplication_update(pid, org string) string {
@@ -70,10 +69,9 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_app_engine_application" "acceptance" {
-  project        = google_project.acceptance.project_id
-  auth_domain    = "tf-test.club"
-  location_id    = "us-central"
-  serving_status = "USER_DISABLED"
-}
-`, pid, pid, org)
+  project         = "${google_project.acceptance.project_id}"
+  auth_domain     = "tf-test.club"
+  location_id     = "us-central"
+  serving_status  = "USER_DISABLED"
+}`, pid, pid, org)
 }
diff --git a/google/resource_app_engine_domain_mapping_test.go b/google/resource_app_engine_domain_mapping_test.go
index 206b468ecef..078a6be7717 100644
--- a/google/resource_app_engine_domain_mapping_test.go
+++ b/google/resource_app_engine_domain_mapping_test.go
@@ -44,23 +44,21 @@ func testAccAppEngineDomainMapping_basic(domainName string) string {
 	return fmt.Sprintf(`
 resource "google_app_engine_domain_mapping" "domain_mapping" {
   domain_name = "%s.gcp.tfacc.hashicorptest.com"
-
+  
   ssl_settings {
     ssl_management_type = "AUTOMATIC"
   }
-}
-`, domainName)
+}`, domainName)
 }
 
 func testAccAppEngineDomainMapping_update(domainName string) string {
 	return fmt.Sprintf(`
 resource "google_app_engine_domain_mapping" "domain_mapping" {
   domain_name = "%s.gcp.tfacc.hashicorptest.com"
-
+  
   ssl_settings {
-    certificate_id      = ""
+  	certificate_id = ""
     ssl_management_type = "MANUAL"
   }
-}
-`, domainName)
+}`, domainName)
 }
diff --git a/google/resource_big_query_dataset_test.go b/google/resource_big_query_dataset_test.go
index 418f62ecc7f..ac3ffe802c9 100644
--- a/google/resource_big_query_dataset_test.go
+++ b/google/resource_big_query_dataset_test.go
@@ -180,56 +180,53 @@ func testAccAddTable(datasetID string, tableID string) resource.TestCheckFunc {
 func testAccBigQueryDataset(datasetID string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "test" {
-  dataset_id                      = "%s"
-  friendly_name                   = "foo"
-  description                     = "This is a foo description"
-  location                        = "EU"
+  dataset_id                  = "%s"
+  friendly_name               = "foo"
+  description                 = "This is a foo description"
+  location                    = "EU"
   default_partition_expiration_ms = 3600000
-  default_table_expiration_ms     = 3600000
+  default_table_expiration_ms = 3600000
 
   labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, datasetID)
+}`, datasetID)
 }
 
 func testAccBigQueryDatasetUpdated(datasetID string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "test" {
-  dataset_id                      = "%s"
-  friendly_name                   = "bar"
-  description                     = "This is a bar description"
-  location                        = "EU"
+  dataset_id                  = "%s"
+  friendly_name               = "bar"
+  description                 = "This is a bar description"
+  location                    = "EU"
   default_partition_expiration_ms = 7200000
-  default_table_expiration_ms     = 7200000
+  default_table_expiration_ms = 7200000
 
   labels = {
     env                         = "bar"
     default_table_expiration_ms = 7200000
   }
-}
-`, datasetID)
+}`, datasetID)
 }
 
 func testAccBigQueryDatasetDeleteContents(datasetID string) string {
 	return fmt.Sprintf(`
 resource "google_bigquery_dataset" "contents_test" {
-  dataset_id                      = "%s"
-  friendly_name                   = "foo"
-  description                     = "This is a foo description"
-  location                        = "EU"
+  dataset_id                  = "%s"
+  friendly_name               = "foo"
+  description                 = "This is a foo description"
+  location                    = "EU"
   default_partition_expiration_ms = 3600000
-  default_table_expiration_ms     = 3600000
-  delete_contents_on_destroy      = true
+  default_table_expiration_ms = 3600000
+  delete_contents_on_destroy = true
 
   labels = {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, datasetID)
+}`, datasetID)
 }
 
 func testAccBigQueryRegionalDataset(datasetID string, location string) string {
@@ -245,8 +242,7 @@ resource "google_bigquery_dataset" "test" {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, datasetID, location)
+}`, datasetID, location)
 }
 
 func testAccBigQueryDatasetWithOneAccess(datasetID string) string {
@@ -263,8 +259,7 @@ resource "google_bigquery_dataset" "access_test" {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, datasetID)
+}`, datasetID)
 }
 
 func testAccBigQueryDatasetWithTwoAccess(datasetID string) string {
@@ -285,8 +280,7 @@ resource "google_bigquery_dataset" "access_test" {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, datasetID)
+}`, datasetID)
 }
 
 func testAccBigQueryDatasetWithViewAccess(datasetID, otherDatasetID, otherTableID string) string {
@@ -299,14 +293,14 @@ resource "google_bigquery_dataset" "other_dataset" {
 
 resource "google_bigquery_table" "table_with_view" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.other_dataset.dataset_id
+  dataset_id = "${google_bigquery_dataset.other_dataset.dataset_id}"
 
   time_partitioning {
     type = "DAY"
   }
 
   view {
-    query          = "SELECT state FROM [lookerdata:cdc.project_tycho_reports]"
+    query = "SELECT state FROM [lookerdata:cdc.project_tycho_reports]"
     use_legacy_sql = true
   }
 }
@@ -320,9 +314,9 @@ resource "google_bigquery_dataset" "access_test" {
   }
   access {
     view {
-      project_id = google_bigquery_dataset.other_dataset.project
-      dataset_id = google_bigquery_dataset.other_dataset.dataset_id
-      table_id   = google_bigquery_table.table_with_view.table_id
+      project_id = "${google_bigquery_dataset.other_dataset.project}"
+      dataset_id = "${google_bigquery_dataset.other_dataset.dataset_id}"
+      table_id   = "${google_bigquery_table.table_with_view.table_id}"
     }
   }
 
@@ -330,8 +324,7 @@ resource "google_bigquery_dataset" "access_test" {
     env                         = "foo"
     default_table_expiration_ms = 3600000
   }
-}
-`, otherDatasetID, otherTableID, datasetID)
+}`, otherDatasetID, otherTableID, datasetID)
 }
 
 func testAccBigQueryDataset_cmek(pid, datasetID, kmsKey string) string {
@@ -341,7 +334,7 @@ data "google_project" "project" {
 }
 
 resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
+  project = "${data.google_project.project.project_id}"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
   member  = "serviceAccount:bq-${data.google_project.project.number}@bigquery-encryption.iam.gserviceaccount.com"
 }
@@ -357,7 +350,7 @@ resource "google_bigquery_dataset" "test" {
     kms_key_name = "%s"
   }
 
-  project = google_project_iam_member.kms-project-binding.project
+  project = "${google_project_iam_member.kms-project-binding.project}"
 }
 `, pid, datasetID, kmsKey)
 }
diff --git a/google/resource_bigquery_data_transfer_config_test.go b/google/resource_bigquery_data_transfer_config_test.go
index ebaa3eb9f48..8d4c31e0549 100644
--- a/google/resource_bigquery_data_transfer_config_test.go
+++ b/google/resource_bigquery_data_transfer_config_test.go
@@ -127,7 +127,7 @@ func testAccBigqueryDataTransferConfig_scheduledQuery(random_suffix, schedule, l
 data "google_project" "project" {}
 
 resource "google_project_iam_member" "permissions" {
-  role   = "roles/iam.serviceAccountShortTermTokenMinter"
+  role = "roles/iam.serviceAccountShortTermTokenMinter"
   member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-bigquerydatatransfer.iam.gserviceaccount.com"
 }
 
@@ -135,24 +135,24 @@ resource "google_project_iam_member" "permissions" {
 resource "google_bigquery_dataset" "my_dataset" {
   depends_on = [google_project_iam_member.permissions]
 
-  dataset_id    = "my_dataset%s"
+  dataset_id = "my_dataset%s"
   friendly_name = "foo"
-  description   = "bar"
-  location      = "asia-northeast1"
+  description = "bar"
+  location = "asia-northeast1"
 }
 
 resource "google_bigquery_data_transfer_config" "query_config" {
   depends_on = [google_project_iam_member.permissions]
 
-  display_name           = "my-query-%s"
-  location               = "asia-northeast1"
-  data_source_id         = "scheduled_query"
-  schedule               = "%s sunday of quarter 00:00"
+  display_name = "my-query-%s"
+  location = "asia-northeast1"
+  data_source_id = "scheduled_query"
+  schedule = "%s sunday of quarter 00:00"
   destination_dataset_id = google_bigquery_dataset.my_dataset.dataset_id
   params = {
     destination_table_name_template = "my-table"
-    write_disposition               = "WRITE_APPEND"
-    query                           = "SELECT name FROM tabl WHERE x = '%s'"
+    write_disposition = "WRITE_APPEND"
+    query = "SELECT name FROM tabl WHERE x = '%s'"
   }
 }
 `, random_suffix, random_suffix, schedule, letter)
@@ -163,26 +163,26 @@ func testAccBigqueryDataTransferConfig_booleanParam(random_suffix string) string
 data "google_project" "project" {}
 
 resource "google_project_iam_member" "permissions" {
-  role   = "roles/iam.serviceAccountShortTermTokenMinter"
+  role = "roles/iam.serviceAccountShortTermTokenMinter"
   member = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-bigquerydatatransfer.iam.gserviceaccount.com"
 }
 
 resource "google_bigquery_dataset" "source_dataset" {
   depends_on = [google_project_iam_member.permissions]
 
-  dataset_id    = "source_%s"
+  dataset_id = "source_%s"
   friendly_name = "foo"
-  description   = "bar"
-  location      = "asia-northeast1"
+  description = "bar"
+  location = "asia-northeast1"
 }
 
 resource "google_bigquery_dataset" "destination_dataset" {
   depends_on = [google_project_iam_member.permissions]
 
-  dataset_id    = "destination_%s"
+  dataset_id = "destination_%s"
   friendly_name = "foo"
-  description   = "bar"
-  location      = "asia-northeast1"
+  description = "bar"
+  location = "asia-northeast1"
 }
 
 resource "google_bigquery_data_transfer_config" "copy_config" {
@@ -190,13 +190,13 @@ resource "google_bigquery_data_transfer_config" "copy_config" {
 
   location = "asia-northeast1"
 
-  display_name           = "Copy test %s"
-  data_source_id         = "cross_region_copy"
+  display_name = "Copy test %s"
+  data_source_id = "cross_region_copy"
   destination_dataset_id = google_bigquery_dataset.destination_dataset.dataset_id
   params = {
     overwrite_destination_table = "true"
-    source_dataset_id           = google_bigquery_dataset.source_dataset.dataset_id
-    source_project_id           = data.google_project.project.project_id
+    source_dataset_id = google_bigquery_dataset.source_dataset.dataset_id
+    source_project_id = data.google_project.project.project_id
   }
 }
 `, random_suffix, random_suffix, random_suffix)
diff --git a/google/resource_bigquery_table_test.go b/google/resource_bigquery_table_test.go
index 7d1a9e9388c..31442d6f131 100644
--- a/google/resource_bigquery_table_test.go
+++ b/google/resource_bigquery_table_test.go
@@ -172,15 +172,15 @@ resource "google_bigquery_dataset" "test" {
 
 resource "google_bigquery_table" "test" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.test.dataset_id
+  dataset_id = "${google_bigquery_dataset.test.dataset_id}"
 
   time_partitioning {
-    type                     = "DAY"
-    field                    = "ts"
+    type = "DAY"
+    field = "ts"
     require_partition_filter = true
   }
-  clustering = ["some_int", "some_string"]
-  schema     = <<EOH
+	clustering = ["some_int", "some_string"]
+  schema = <<EOH
 [
   {
     "name": "ts",
@@ -216,9 +216,7 @@ resource "google_bigquery_table" "test" {
   }
 ]
 EOH
-
-}
-`, datasetID, tableID)
+}`, datasetID, tableID)
 }
 
 func testAccBigQueryTableWithView(datasetID, tableID string) string {
@@ -229,18 +227,17 @@ resource "google_bigquery_dataset" "test" {
 
 resource "google_bigquery_table" "test" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.test.dataset_id
+  dataset_id = "${google_bigquery_dataset.test.dataset_id}"
 
   time_partitioning {
     type = "DAY"
   }
 
   view {
-    query          = "SELECT state FROM [lookerdata:cdc.project_tycho_reports]"
-    use_legacy_sql = true
+  	query = "SELECT state FROM [lookerdata:cdc.project_tycho_reports]"
+  	use_legacy_sql = true
   }
-}
-`, datasetID, tableID)
+}`, datasetID, tableID)
 }
 
 func testAccBigQueryTableWithNewSqlView(datasetID, tableID string) string {
@@ -251,18 +248,17 @@ resource "google_bigquery_dataset" "test" {
 
 resource "google_bigquery_table" "test" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.test.dataset_id
+  dataset_id = "${google_bigquery_dataset.test.dataset_id}"
 
   time_partitioning {
     type = "DAY"
   }
 
   view {
-    query          = "%s"
-    use_legacy_sql = false
+  	query = "%s"
+  	use_legacy_sql = false
   }
-}
-`, datasetID, tableID, "SELECT state FROM `lookerdata.cdc.project_tycho_reports`")
+}`, datasetID, tableID, "SELECT state FROM `lookerdata.cdc.project_tycho_reports`")
 }
 
 func testAccBigQueryTableUpdated(datasetID, tableID string) string {
@@ -273,7 +269,7 @@ resource "google_bigquery_dataset" "test" {
 
 resource "google_bigquery_table" "test" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.test.dataset_id
+  dataset_id = "${google_bigquery_dataset.test.dataset_id}"
 
   time_partitioning {
     type = "DAY"
@@ -321,9 +317,7 @@ resource "google_bigquery_table" "test" {
   }
 ]
 EOH
-
-}
-`, datasetID, tableID)
+}`, datasetID, tableID)
 }
 
 func testAccBigQueryTableFromGCS(datasetID, tableID, bucketName, objectName, content, format, quoteChar string) string {
@@ -333,7 +327,7 @@ resource "google_bigquery_dataset" "test" {
 }
 
 resource "google_storage_bucket" "test" {
-  name          = "%s"
+  name     = "%s"
   force_destroy = true
 }
 
@@ -342,13 +336,12 @@ resource "google_storage_bucket_object" "test" {
   content = <<EOF
 %s
 EOF
-
-  bucket = google_storage_bucket.test.name
+  bucket  = "${google_storage_bucket.test.name}"
 }
 
 resource "google_bigquery_table" "test" {
   table_id   = "%s"
-  dataset_id = google_bigquery_dataset.test.dataset_id
+  dataset_id = "${google_bigquery_dataset.test.dataset_id}"
   external_data_configuration {
     autodetect    = true
     source_format = "%s"
@@ -358,11 +351,10 @@ resource "google_bigquery_table" "test" {
     }
 
     source_uris = [
-      "gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}",
+      "gs://${google_storage_bucket.test.name}/${google_storage_bucket_object.test.name}"
     ]
   }
-}
-`, datasetID, bucketName, objectName, content, tableID, format, quoteChar)
+}`, datasetID, bucketName, objectName, content, tableID, format, quoteChar)
 }
 
 var TEST_CSV = `lifelock,LifeLock,,web,Tempe,AZ,1-May-07,6850000,USD,b
diff --git a/google/resource_bigtable_app_profile_test.go b/google/resource_bigtable_app_profile_test.go
index bae6f3149c3..440d236799d 100644
--- a/google/resource_bigtable_app_profile_test.go
+++ b/google/resource_bigtable_app_profile_test.go
@@ -43,44 +43,42 @@ func TestAccBigtableAppProfile_update(t *testing.T) {
 func testAccBigtableAppProfile_multiClusterRouting(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s"
-    zone         = "us-central1-b"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s"
+		zone         = "us-central1-b"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
 }
 
 resource "google_bigtable_app_profile" "ap" {
-  instance       = google_bigtable_instance.instance.name
-  app_profile_id = "test"
+	instance = google_bigtable_instance.instance.name
+	app_profile_id = "test"
 
-  multi_cluster_routing_use_any = true
-  ignore_warnings               = true
-}
-`, instanceName, instanceName)
+	multi_cluster_routing_use_any = true
+	ignore_warnings = true
+}`, instanceName, instanceName)
 }
 
 func testAccBigtableAppProfile_update(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s"
-    zone         = "us-central1-b"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s"
+		zone         = "us-central1-b"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
 }
 
 resource "google_bigtable_app_profile" "ap" {
-  instance       = google_bigtable_instance.instance.name
-  app_profile_id = "test"
-  description    = "add a description"
+	instance = google_bigtable_instance.instance.name
+	app_profile_id = "test"
+	description = "add a description"
 
-  multi_cluster_routing_use_any = true
-  ignore_warnings               = true
-}
-`, instanceName, instanceName)
+	multi_cluster_routing_use_any = true
+	ignore_warnings = true
+}`, instanceName, instanceName)
 }
diff --git a/google/resource_bigtable_gc_policy_test.go b/google/resource_bigtable_gc_policy_test.go
index 904da302717..46cee1b5096 100644
--- a/google/resource_bigtable_gc_policy_test.go
+++ b/google/resource_bigtable_gc_policy_test.go
@@ -127,7 +127,7 @@ func testAccBigtableGCPolicyExists(n string) resource.TestCheckFunc {
 func testAccBigtableGCPolicy(instanceName, tableName, family string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
+  name          = "%s"
 
   cluster {
     cluster_id = "%s"
@@ -139,7 +139,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
 
   column_family {
     family = "%s"
@@ -147,11 +147,11 @@ resource "google_bigtable_table" "table" {
 }
 
 resource "google_bigtable_gc_policy" "policy" {
-  instance_name = google_bigtable_instance.instance.name
-  table         = google_bigtable_table.table.name
+  instance_name = "${google_bigtable_instance.instance.name}"
+  table         = "${google_bigtable_table.table.name}"
   column_family = "%s"
 
-  max_age {
+  max_age {	
     days = 3
   }
 }
@@ -161,7 +161,7 @@ resource "google_bigtable_gc_policy" "policy" {
 func testAccBigtableGCPolicyUnion(instanceName, tableName, family string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
+  name          = "%s"
 
   cluster {
     cluster_id = "%s"
@@ -173,7 +173,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
 
   column_family {
     family = "%s"
@@ -181,8 +181,8 @@ resource "google_bigtable_table" "table" {
 }
 
 resource "google_bigtable_gc_policy" "policy" {
-  instance_name = google_bigtable_instance.instance.name
-  table         = google_bigtable_table.table.name
+  instance_name = "${google_bigtable_instance.instance.name}"
+  table         = "${google_bigtable_table.table.name}"
   column_family = "%s"
 
   mode = "UNION"
diff --git a/google/resource_bigtable_instance_iam_test.go b/google/resource_bigtable_instance_iam_test.go
index c4a068ba1c1..a2b83bc1600 100644
--- a/google/resource_bigtable_instance_iam_test.go
+++ b/google/resource_bigtable_instance_iam_test.go
@@ -120,6 +120,7 @@ func TestAccBigtableInstanceIamPolicy(t *testing.T) {
 
 func testAccBigtableInstanceIamBinding_basic(instance, cluster, account, role string) string {
 	return fmt.Sprintf(testBigtableInstanceIam+`
+
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
   display_name = "Bigtable Instance IAM Testing Account"
@@ -131,9 +132,9 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_bigtable_instance_iam_binding" "binding" {
-  instance = google_bigtable_instance.instance.name
-  role     = "%s"
-  members = [
+  instance      = "${google_bigtable_instance.instance.name}"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
   ]
 }
@@ -153,9 +154,9 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_bigtable_instance_iam_binding" "binding" {
-  instance = google_bigtable_instance.instance.name
-  role     = "%s"
-  members = [
+  instance      = "${google_bigtable_instance.instance.name}"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
     "serviceAccount:${google_service_account.test-account2.email}",
   ]
@@ -171,9 +172,9 @@ resource "google_service_account" "test-account" {
 }
 
 resource "google_bigtable_instance_iam_member" "member" {
-  instance = google_bigtable_instance.instance.name
-  role     = "%s"
-  member   = "serviceAccount:${google_service_account.test-account.email}"
+  instance      = "${google_bigtable_instance.instance.name}"
+  role         = "%s"
+  member       = "serviceAccount:${google_service_account.test-account.email}"
 }
 `, instance, cluster, account, role)
 }
@@ -186,15 +187,15 @@ resource "google_service_account" "test-account" {
 }
 
 data "google_iam_policy" "policy" {
-  binding {
-    role    = "%s"
-    members = ["serviceAccount:${google_service_account.test-account.email}"]
-  }
+	binding {
+		role    = "%s"
+		members = ["serviceAccount:${google_service_account.test-account.email}"]
+	}
 }
 
 resource "google_bigtable_instance_iam_policy" "policy" {
-  instance    = google_bigtable_instance.instance.name
-  policy_data = data.google_iam_policy.policy.policy_data
+  instance      = "${google_bigtable_instance.instance.name}"
+  policy_data  = "${data.google_iam_policy.policy.policy_data}"
 }
 `, instance, cluster, account, role)
 }
@@ -210,5 +211,4 @@ resource "google_bigtable_instance" "instance" {
       zone         = "us-central1-b"
       storage_type = "HDD"
     }
-}
-`
+}`
diff --git a/google/resource_bigtable_instance_test.go b/google/resource_bigtable_instance_test.go
index e03f962c279..42be4974b73 100644
--- a/google/resource_bigtable_instance_test.go
+++ b/google/resource_bigtable_instance_test.go
@@ -136,13 +136,13 @@ func testAccCheckBigtableInstanceDestroy(s *terraform.State) error {
 func testAccBigtableInstance(instanceName string, numNodes int) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s"
-    zone         = "us-central1-b"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s"
+		zone         = "us-central1-b"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
 }
 `, instanceName, instanceName, numNodes)
 }
@@ -150,7 +150,7 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_invalid(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
+	name = "%s"
 }
 `, instanceName)
 }
@@ -158,31 +158,31 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_cluster(instanceName string, numNodes int) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s-a"
-    zone         = "us-central1-a"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-b"
-    zone         = "us-central1-b"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-c"
-    zone         = "us-central1-c"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-d"
-    zone         = "us-central1-f"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s-a"
+		zone         = "us-central1-a"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-b"
+		zone         = "us-central1-b"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-c"
+		zone         = "us-central1-c"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-d"
+		zone         = "us-central1-f"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
 }
 `, instanceName, instanceName, numNodes, instanceName, numNodes, instanceName, numNodes, instanceName, numNodes)
 }
@@ -190,37 +190,37 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_clusterMax(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s-a"
-    zone         = "us-central1-a"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-b"
-    zone         = "us-central1-b"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-c"
-    zone         = "us-central1-c"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-d"
-    zone         = "us-central1-f"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-e"
-    zone         = "us-east1-a"
-    num_nodes    = 3
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s-a"
+		zone         = "us-central1-a"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-b"
+		zone         = "us-central1-b"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-c"
+		zone         = "us-central1-c"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-d"
+		zone         = "us-central1-f"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-e"
+		zone         = "us-east1-a"
+		num_nodes    = 3
+		storage_type = "HDD"
+	}
 }
 `, instanceName, instanceName, instanceName, instanceName, instanceName, instanceName)
 }
@@ -228,31 +228,31 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_cluster_reordered(instanceName string, numNodes int) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id   = "%s-c"
-    zone         = "us-central1-c"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-d"
-    zone         = "us-central1-f"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-a"
-    zone         = "us-central1-a"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
-  cluster {
-    cluster_id   = "%s-b"
-    zone         = "us-central1-b"
-    num_nodes    = %d
-    storage_type = "HDD"
-  }
+	name = "%s"
+	cluster {
+		cluster_id   = "%s-c"
+		zone         = "us-central1-c"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-d"
+		zone         = "us-central1-f"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-a"
+		zone         = "us-central1-a"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
+	cluster {
+		cluster_id   = "%s-b"
+		zone         = "us-central1-b"
+		num_nodes    = %d
+		storage_type = "HDD"
+	}
 }
 `, instanceName, instanceName, numNodes, instanceName, numNodes, instanceName, numNodes, instanceName, numNodes)
 }
@@ -260,12 +260,12 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_development(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id = "%s"
-    zone       = "us-central1-b"
-  }
-  instance_type = "DEVELOPMENT"
+	name = "%s"
+	cluster {
+		cluster_id    = "%s"
+		zone          = "us-central1-b"
+	}
+	instance_type = "DEVELOPMENT"
 }
 `, instanceName, instanceName)
 }
@@ -273,13 +273,13 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_development_invalid_num_nodes(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
-  cluster {
-    cluster_id = "%s"
-    zone       = "us-central1-b"
-    num_nodes  = 3
-  }
-  instance_type = "DEVELOPMENT"
+	name = "%s"
+	cluster {
+		cluster_id    = "%s"
+		zone          = "us-central1-b"
+        num_nodes     = 3
+	}
+	instance_type = "DEVELOPMENT"
 }
 `, instanceName, instanceName)
 }
@@ -287,8 +287,8 @@ resource "google_bigtable_instance" "instance" {
 func testAccBigtableInstance_development_invalid_no_cluster(instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name          = "%s"
-  instance_type = "DEVELOPMENT"
+	name = "%s"
+	instance_type = "DEVELOPMENT"
 }
 `, instanceName)
 }
diff --git a/google/resource_bigtable_table_test.go b/google/resource_bigtable_table_test.go
index 48608f8ab27..f8b7176fabe 100644
--- a/google/resource_bigtable_table_test.go
+++ b/google/resource_bigtable_table_test.go
@@ -143,7 +143,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
 }
 `, instanceName, instanceName, tableName)
 }
@@ -161,7 +161,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
   split_keys    = ["a", "b", "c"]
 }
 `, instanceName, instanceName, tableName)
@@ -170,7 +170,7 @@ resource "google_bigtable_table" "table" {
 func testAccBigtableTable_family(instanceName, tableName, family string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
+  name          = "%s"
 
   cluster {
     cluster_id = "%s"
@@ -182,7 +182,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
 
   column_family {
     family = "%s"
@@ -194,7 +194,7 @@ resource "google_bigtable_table" "table" {
 func testAccBigtableTable_familyMany(instanceName, tableName, family string) string {
 	return fmt.Sprintf(`
 resource "google_bigtable_instance" "instance" {
-  name = "%s"
+  name          = "%s"
 
   cluster {
     cluster_id = "%s"
@@ -206,7 +206,7 @@ resource "google_bigtable_instance" "instance" {
 
 resource "google_bigtable_table" "table" {
   name          = "%s"
-  instance_name = google_bigtable_instance.instance.name
+  instance_name = "${google_bigtable_instance.instance.name}"
 
   column_family {
     family = "%s-first"
diff --git a/google/resource_binaryauthorization_attestor_test.go b/google/resource_binaryauthorization_attestor_test.go
index 2a4cf00e3f4..0127aa4008a 100644
--- a/google/resource_binaryauthorization_attestor_test.go
+++ b/google/resource_binaryauthorization_attestor_test.go
@@ -124,7 +124,7 @@ resource "google_container_analysis_note" "note" {
 resource "google_binary_authorization_attestor" "attestor" {
   name = "tf-test-%s"
   attestation_authority_note {
-    note_reference = google_container_analysis_note.note.name
+    note_reference = "${google_container_analysis_note.note.name}"
   }
 }
 `, name, name)
@@ -142,15 +142,14 @@ resource "google_container_analysis_note" "note" {
 }
 
 resource "google_binary_authorization_attestor" "attestor" {
-  name        = "tf-test-%s"
+  name = "tf-test-%s"
   description = "my description"
   attestation_authority_note {
-    note_reference = google_container_analysis_note.note.name
+    note_reference = "${google_container_analysis_note.note.name}"
     public_keys {
       ascii_armored_pgp_public_key = <<EOF
 %s
 EOF
-
       comment = "this key has a comment"
     }
   }
@@ -179,8 +178,7 @@ qoIRW6y0+UlAc+MbqfL0ziHDOAmcqz1GnROg
 =6Bvm`
 
 func testAccBinaryAuthorizationAttestorKms(attestorName, kmsKey string) string {
-	return fmt.Sprintf(`
-data "google_kms_crypto_key_version" "version" {
+	return fmt.Sprintf(`data "google_kms_crypto_key_version" "version" {
   crypto_key = "%s"
 }
 
@@ -196,15 +194,14 @@ resource "google_container_analysis_note" "note" {
 resource "google_binary_authorization_attestor" "attestor" {
   name = "%s"
   attestation_authority_note {
-    note_reference = google_container_analysis_note.note.name
+    note_reference = "${google_container_analysis_note.note.name}"
     public_keys {
-      id = data.google_kms_crypto_key_version.version.id
+      id = "${data.google_kms_crypto_key_version.version.id}"
       pkix_public_key {
-        public_key_pem      = data.google_kms_crypto_key_version.version.public_key[0].pem
-        signature_algorithm = data.google_kms_crypto_key_version.version.public_key[0].algorithm
+        public_key_pem     = "${data.google_kms_crypto_key_version.version.public_key[0].pem}"
+        signature_algorithm = "${data.google_kms_crypto_key_version.version.public_key[0].algorithm}"
       }
     }
   }
-}
-`, kmsKey, attestorName, attestorName)
+}`, kmsKey, attestorName, attestorName)
 }
diff --git a/google/resource_binaryauthorization_policy_test.go b/google/resource_binaryauthorization_policy_test.go
index 3d3eae0027a..224ddfaf8ed 100644
--- a/google/resource_binaryauthorization_policy_test.go
+++ b/google/resource_binaryauthorization_policy_test.go
@@ -70,7 +70,7 @@ resource "google_project" "project" {
 }
 
 resource "google_project_service" "binauthz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "binaryauthorization.googleapis.com"
 }
 `, pid, pname, org, billing)
@@ -87,23 +87,23 @@ resource "google_project" "project" {
 }
 
 resource "google_project_service" "binauthz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "binaryauthorization.googleapis.com"
 }
 
 resource "google_binary_authorization_policy" "policy" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
 
   admission_whitelist_patterns {
-    name_pattern = "gcr.io/google_containers/*"
+    name_pattern= "gcr.io/google_containers/*"
   }
 
   default_admission_rule {
-    evaluation_mode  = "ALWAYS_DENY"
+    evaluation_mode = "ALWAYS_DENY"
     enforcement_mode = "ENFORCED_BLOCK_AND_AUDIT_LOG"
   }
 
-  depends_on = [google_project_service.binauthz]
+  depends_on = ["google_project_service.binauthz"]
 }
 `, pid, pname, org, billing)
 }
diff --git a/google/resource_cloudbuild_trigger_test.go b/google/resource_cloudbuild_trigger_test.go
index 08882da12c1..b272f4387c2 100644
--- a/google/resource_cloudbuild_trigger_test.go
+++ b/google/resource_cloudbuild_trigger_test.go
@@ -89,7 +89,7 @@ func TestAccCloudBuildTrigger_fullStep(t *testing.T) {
 func testAccCloudBuildTrigger_basic(name string) string {
 	return fmt.Sprintf(`
 resource "google_cloudbuild_trigger" "build_trigger" {
-  name        = "%s"
+  name = "%s"
   description = "acceptance test build trigger"
   trigger_template {
     branch_name = "master"
@@ -97,7 +97,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   }
   build {
     images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
-    tags   = ["team-a", "service-b"]
+    tags = ["team-a", "service-b"]
     step {
       name = "gcr.io/cloud-builders/gsutil"
       args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
@@ -105,7 +105,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     step {
       name = "gcr.io/cloud-builders/go"
       args = ["build", "my_package"]
-      env  = ["env1=two"]
+      env = ["env1=two"]
     }
     step {
       name = "gcr.io/cloud-builders/docker"
@@ -113,14 +113,14 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     }
   }
 }
-`, name)
+  `, name)
 }
 
 func testAccCloudBuildTrigger_basicDisabled(name string) string {
 	return fmt.Sprintf(`
 resource "google_cloudbuild_trigger" "build_trigger" {
-  disabled    = true
-  name        = "%s"
+  disabled = true
+  name = "%s"
   description = "acceptance test build trigger"
   trigger_template {
     branch_name = "master"
@@ -128,7 +128,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   }
   build {
     images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
-    tags   = ["team-a", "service-b"]
+    tags = ["team-a", "service-b"]
     step {
       name = "gcr.io/cloud-builders/gsutil"
       args = ["cp", "gs://mybucket/remotefile.zip", "localfile.zip"]
@@ -136,7 +136,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     step {
       name = "gcr.io/cloud-builders/go"
       args = ["build", "my_package"]
-      env  = ["env1=two"]
+      env = ["env1=two"]
     }
     step {
       name = "gcr.io/cloud-builders/docker"
@@ -144,7 +144,7 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     }
   }
 }
-`, name)
+  `, name)
 }
 
 func testAccCloudBuildTrigger_fullStep() string {
@@ -157,34 +157,34 @@ resource "google_cloudbuild_trigger" "build_trigger" {
   }
   build {
     images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$COMMIT_SHA"]
-    tags   = ["team-a", "service-b"]
+    tags = ["team-a", "service-b"]
     step {
-      name       = "gcr.io/cloud-builders/go"
-      args       = ["build", "my_package"]
-      env        = ["env1=two"]
-      dir        = "directory"
-      id         = "12345"
+      name = "gcr.io/cloud-builders/go"
+      args = ["build", "my_package"]
+      env = ["env1=two"]
+      dir = "directory"
+      id = "12345"
       secret_env = ["fooo"]
-      timeout    = "100s"
-      wait_for   = ["something"]
+      timeout = "100s"
+      wait_for = ["something"]
     }
   }
 }
-`)
+  `)
 }
 
 func testAccCloudBuildTrigger_updated(name string) string {
 	return fmt.Sprintf(`
 resource "google_cloudbuild_trigger" "build_trigger" {
   description = "acceptance test build trigger updated"
-  name        = "%s"
+  name = "%s"
   trigger_template {
     branch_name = "master-updated"
     repo_name   = "some-repo-updated"
   }
   build {
     images = ["gcr.io/$PROJECT_ID/$REPO_NAME:$SHORT_SHA"]
-    tags   = ["team-a", "service-b", "updated"]
+    tags = ["team-a", "service-b", "updated"]
     step {
       name = "gcr.io/cloud-builders/gsutil"
       args = ["cp", "gs://mybucket/remotefile.zip", "localfile-updated.zip"]
@@ -203,5 +203,5 @@ resource "google_cloudbuild_trigger" "build_trigger" {
     }
   }
 }
-`, name)
+  `, name)
 }
diff --git a/google/resource_cloudfunctions_function_test.go b/google/resource_cloudfunctions_function_test.go
index d7e5b77f998..46c193c28b5 100644
--- a/google/resource_cloudfunctions_function_test.go
+++ b/google/resource_cloudfunctions_function_test.go
@@ -495,7 +495,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -504,16 +504,16 @@ resource "google_cloudfunctions_function" "function" {
   runtime               = "nodejs8"
   description           = "test function"
   available_memory_mb   = 128
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   trigger_http          = true
   timeout               = 61
   entry_point           = "helloGET"
   labels = {
-    my-label = "my-label-value"
+	my-label = "my-label-value"
   }
   environment_variables = {
-    TEST_ENV_VARIABLE = "test-env-variable-value"
+	TEST_ENV_VARIABLE = "test-env-variable-value"
   }
   max_instances = 10
 }
@@ -528,7 +528,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index_update.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -536,23 +536,22 @@ resource "google_cloudfunctions_function" "function" {
   name                  = "%s"
   description           = "test function updated"
   available_memory_mb   = 256
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   trigger_http          = true
   runtime               = "nodejs8"
   timeout               = 91
   entry_point           = "helloGET"
   labels = {
-    my-label    = "my-updated-label-value"
-    a-new-label = "a-new-label-value"
+	my-label = "my-updated-label-value"
+	a-new-label = "a-new-label-value"
   }
   environment_variables = {
-    TEST_ENV_VARIABLE = "test-env-variable-value"
-    NEW_ENV_VARIABLE  = "new-env-variable-value"
+	TEST_ENV_VARIABLE = "test-env-variable-value"
+	NEW_ENV_VARIABLE = "new-env-variable-value"
   }
   max_instances = 15
-}
-`, bucketName, zipFilePath, functionName)
+}`, bucketName, zipFilePath, functionName)
 }
 
 func testAccCloudFunctionsFunction_pubsub(functionName string, bucketName string,
@@ -564,7 +563,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -576,26 +575,24 @@ resource "google_cloudfunctions_function" "function" {
   name                  = "%s"
   runtime               = "nodejs8"
   available_memory_mb   = 128
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   timeout               = 61
   entry_point           = "helloPubSub"
   event_trigger {
     event_type = "providers/cloud.pubsub/eventTypes/topic.publish"
-    resource   = google_pubsub_topic.sub.name
+    resource   = "${google_pubsub_topic.sub.name}"
     failure_policy {
       retry = false
     }
   }
-}
-`, bucketName, zipFilePath, topic, functionName)
+}`, bucketName, zipFilePath, topic, functionName)
 }
 
 func testAccCloudFunctionsFunction_bucket(functionName string, bucketName string,
 	zipFilePath string) string {
 	return fmt.Sprintf(`
-data "google_client_config" "current" {
-}
+data "google_client_config" "current" {}
 
 resource "google_storage_bucket" "bucket" {
   name = "%s"
@@ -603,7 +600,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -611,8 +608,8 @@ resource "google_cloudfunctions_function" "function" {
   name                  = "%s"
   runtime               = "nodejs8"
   available_memory_mb   = 128
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   timeout               = 61
   entry_point           = "helloGCS"
   event_trigger {
@@ -622,8 +619,7 @@ resource "google_cloudfunctions_function" "function" {
       retry = true
     }
   }
-}
-`, bucketName, zipFilePath, functionName)
+}`, bucketName, zipFilePath, functionName)
 }
 
 func testAccCloudFunctionsFunction_bucketNoRetry(functionName string, bucketName string,
@@ -635,7 +631,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -643,16 +639,15 @@ resource "google_cloudfunctions_function" "function" {
   name                  = "%s"
   runtime               = "nodejs8"
   available_memory_mb   = 128
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   timeout               = 61
   entry_point           = "helloGCS"
   event_trigger {
     event_type = "google.storage.object.finalize"
-    resource   = google_storage_bucket.bucket.name
+    resource   = "${google_storage_bucket.bucket.name}"
   }
-}
-`, bucketName, zipFilePath, functionName)
+}`, bucketName, zipFilePath, functionName)
 }
 
 func testAccCloudFunctionsFunction_firestore(functionName string, bucketName string,
@@ -664,7 +659,7 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
@@ -672,22 +667,21 @@ resource "google_cloudfunctions_function" "function" {
   name                  = "%s"
   runtime               = "nodejs8"
   available_memory_mb   = 128
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
   timeout               = 61
   entry_point           = "helloFirestore"
   event_trigger {
     event_type = "providers/cloud.firestore/eventTypes/document.write"
     resource   = "messages/{messageId}"
   }
-}
-`, bucketName, zipFilePath, functionName)
+}`, bucketName, zipFilePath, functionName)
 }
 
 func testAccCloudFunctionsFunction_sourceRepo(functionName, project string) string {
 	return fmt.Sprintf(`
 resource "google_cloudfunctions_function" "function" {
-  name    = "%s"
+  name = "%s"
   runtime = "nodejs8"
 
   source_repository {
@@ -712,24 +706,22 @@ resource "google_storage_bucket" "bucket" {
 
 resource "google_storage_bucket_object" "archive" {
   name   = "index.zip"
-  bucket = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   source = "%s"
 }
 
-data "google_compute_default_service_account" "default" {
-}
+data "google_compute_default_service_account" "default" { }
 
 resource "google_cloudfunctions_function" "function" {
-  name    = "%s"
+  name = "%s"
   runtime = "nodejs8"
 
-  source_archive_bucket = google_storage_bucket.bucket.name
-  source_archive_object = google_storage_bucket_object.archive.name
+  source_archive_bucket = "${google_storage_bucket.bucket.name}"
+  source_archive_object = "${google_storage_bucket_object.archive.name}"
 
-  service_account_email = data.google_compute_default_service_account.default.email
+  service_account_email = "${data.google_compute_default_service_account.default.email}"
 
   trigger_http = true
   entry_point  = "helloGET"
-}
-`, bucketName, zipFilePath, functionName)
+}`, bucketName, zipFilePath, functionName)
 }
diff --git a/google/resource_cloudiot_registry_test.go b/google/resource_cloudiot_registry_test.go
index 306347add3e..a002e821667 100644
--- a/google/resource_cloudiot_registry_test.go
+++ b/google/resource_cloudiot_registry_test.go
@@ -179,9 +179,8 @@ func testAccCheckCloudIoTRegistryDestroy(s *terraform.State) error {
 func testAccCloudIoTRegistry_basic(registryName string) string {
 	return fmt.Sprintf(`
 resource "google_cloudiot_registry" "foobar" {
-  name = "%s"
-}
-`, registryName)
+	name = "%s"
+}`, registryName)
 }
 
 func testAccCloudIoTRegistry_extended(registryName string) string {
@@ -200,16 +199,16 @@ resource "google_pubsub_topic" "default-telemetry" {
 }
 
 resource "google_cloudiot_registry" "foobar" {
-  depends_on = [google_project_iam_binding.cloud-iot-iam-binding]
+  depends_on = ["google_project_iam_binding.cloud-iot-iam-binding"]
 
   name = "%s"
 
   event_notification_configs {
-    pubsub_topic_name = google_pubsub_topic.default-devicestatus.id
+    pubsub_topic_name = "${google_pubsub_topic.default-devicestatus.id}"
   }
 
   state_notification_config = {
-    pubsub_topic_name = google_pubsub_topic.default-telemetry.id
+    pubsub_topic_name = "${google_pubsub_topic.default-telemetry.id}"
   }
 
   http_config = {
@@ -219,13 +218,13 @@ resource "google_cloudiot_registry" "foobar" {
   mqtt_config = {
     mqtt_enabled_state = "MQTT_DISABLED"
   }
-
+	
   log_level = "INFO"
 
   credentials {
     public_key_certificate = {
       format      = "X509_CERTIFICATE_PEM"
-      certificate = file("test-fixtures/rsa_cert.pem")
+      certificate = "${file("test-fixtures/rsa_cert.pem")}"
     }
   }
 }
@@ -244,13 +243,13 @@ resource "google_pubsub_topic" "event-topic-1" {
 }
 
 resource "google_cloudiot_registry" "foobar" {
-  depends_on = [google_project_iam_binding.cloud-iot-iam-binding]
+  depends_on = ["google_project_iam_binding.cloud-iot-iam-binding"]
 
   name = "%s"
 
   event_notification_configs {
-    pubsub_topic_name = google_pubsub_topic.event-topic-1.id
-    subfolder_matches = ""
+    pubsub_topic_name = "${google_pubsub_topic.event-topic-1.id}"
+	subfolder_matches = ""
   }
 }
 `, topic, registryName)
@@ -272,18 +271,18 @@ resource "google_pubsub_topic" "event-topic-2" {
 }
 
 resource "google_cloudiot_registry" "foobar" {
-  depends_on = [google_project_iam_binding.cloud-iot-iam-binding]
+  depends_on = ["google_project_iam_binding.cloud-iot-iam-binding"]
 
   name = "%s"
 
   event_notification_configs {
-    pubsub_topic_name = google_pubsub_topic.event-topic-1.id
-    subfolder_matches = "test"
+    pubsub_topic_name = "${google_pubsub_topic.event-topic-1.id}"
+	subfolder_matches = "test"
   }
 
   event_notification_configs {
-    pubsub_topic_name = google_pubsub_topic.event-topic-2.id
-    subfolder_matches = ""
+    pubsub_topic_name = "${google_pubsub_topic.event-topic-2.id}"
+	subfolder_matches = ""
   }
 }
 `, topic, topic, registryName)
diff --git a/google/resource_composer_environment_test.go b/google/resource_composer_environment_test.go
index 9756bcd4866..e09399b3ef8 100644
--- a/google/resource_composer_environment_test.go
+++ b/google/resource_composer_environment_test.go
@@ -304,29 +304,29 @@ func testAccComposerEnvironmentDestroy(s *terraform.State) error {
 func testAccComposerEnvironment_basic(name, network, subnetwork string) string {
 	return fmt.Sprintf(`
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-  config {
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-    }
-  }
+	name   = "%s"
+	region = "us-central1"
+	config {
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork = "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+		}
+	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel
 // that use the default network/subnet
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.test.self_link
+	name          = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.test.self_link}"
 }
 `, name, network, subnetwork)
 }
@@ -334,38 +334,38 @@ resource "google_compute_subnetwork" "test" {
 func testAccComposerEnvironment_private(name, network, subnetwork string) string {
 	return fmt.Sprintf(`
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-
-  config {
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-      ip_allocation_policy {
-        use_ip_aliases          = true
-        cluster_ipv4_cidr_block = "10.0.0.0/16"
-      }
-    }
-    private_environment_config {
-      enable_private_endpoint = true
-    }
-  }
+	name           = "%s"
+	region         = "us-central1"
+
+	config {
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork = "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+			ip_allocation_policy {
+				use_ip_aliases = true
+				cluster_ipv4_cidr_block = "10.0.0.0/16"
+			}
+		}
+		private_environment_config {
+			enable_private_endpoint = true
+		}
+	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel
 // that use the default network/subnet
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name                     = "%s"
-  ip_cidr_range            = "10.2.0.0/16"
-  region                   = "us-central1"
-  network                  = google_compute_network.test.self_link
-  private_ip_google_access = true
+	name                     = "%s"
+	ip_cidr_range            = "10.2.0.0/16"
+	region                   = "us-central1"
+	network                  = "${google_compute_network.test.self_link}"
+	private_ip_google_access = true
 }
 `, name, network, subnetwork)
 }
@@ -376,52 +376,52 @@ data "google_composer_image_versions" "all" {
 }
 
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-
-  config {
-    node_count = 4
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-    }
+	name   = "%s"
+	region = "us-central1"
+
+	config {
+		node_count = 4
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork = "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+		}
 
-    software_config {
-      image_version = data.google_composer_image_versions.all.image_versions[0].image_version_id
+		software_config {
+			image_version = "${data.google_composer_image_versions.all.image_versions.0.image_version_id}"
 
-      airflow_config_overrides = {
-        core-load_example = "True"
-      }
+			airflow_config_overrides = {
+			  core-load_example = "True"
+			}
 
-      pypi_packages = {
-        numpy = ""
-      }
+			pypi_packages = {
+			  numpy = ""
+			}
 
-      env_variables = {
-        FOO = "bar"
-      }
-    }
-  }
+			env_variables = {
+			   FOO = "bar"
+			}
+		}
+ 	}
 
-  labels = {
-    foo          = "bar"
-    anotherlabel = "boo"
-  }
+	labels = {
+ 		foo = "bar"
+		anotherlabel = "boo"
+ 	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel
 // that use the default network/subnet
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.test.self_link
+	name          = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.test.self_link}"
 }
 `, name, network, subnetwork)
 }
@@ -429,31 +429,31 @@ resource "google_compute_subnetwork" "test" {
 func testAccComposerEnvironment_nodeCfg(environment, network, subnetwork, serviceAccount string) string {
 	return fmt.Sprintf(`
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-  config {
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-
-      service_account = google_service_account.test.name
-    }
-  }
+	name   = "%s"
+	region = "us-central1"
+	config {
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork =  "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+
+			service_account = "${google_service_account.test.name}"
+		}
+	}
 
-  depends_on = [google_project_iam_member.composer-worker]
+	depends_on = ["google_project_iam_member.composer-worker"]
 }
 
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.test.self_link
+	name          = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.test.self_link}"
 }
 
 resource "google_service_account" "test" {
@@ -462,8 +462,8 @@ resource "google_service_account" "test" {
 }
 
 resource "google_project_iam_member" "composer-worker" {
-  role   = "roles/composer.worker"
-  member = "serviceAccount:${google_service_account.test.email}"
+  role    = "roles/composer.worker"
+  member  = "serviceAccount:${google_service_account.test.email}"
 }
 `, environment, network, subnetwork, serviceAccount)
 }
@@ -474,33 +474,33 @@ data "google_composer_image_versions" "all" {
 }
 
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-  config {
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-    }
-    software_config {
-      image_version  = data.google_composer_image_versions.all.image_versions[0].image_version_id
-      python_version = "3"
-    }
-  }
+	name           = "%s"
+	region         = "us-central1"
+	config {
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork =  "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+		}
+		software_config {
+			image_version  = "${data.google_composer_image_versions.all.image_versions.0.image_version_id}"
+			python_version = "3"
+		}
+	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel
 // that use the default network/subnet
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.test.self_link
+	name          = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.test.self_link}"
 }
 `, name, network, subnetwork)
 }
@@ -508,34 +508,34 @@ resource "google_compute_subnetwork" "test" {
 func testAccComposerEnvironment_updateOnlyFields(name, network, subnetwork string) string {
 	return fmt.Sprintf(`
 resource "google_composer_environment" "test" {
-  name   = "%s"
-  region = "us-central1"
-  config {
-    node_config {
-      network    = google_compute_network.test.self_link
-      subnetwork = google_compute_subnetwork.test.self_link
-      zone       = "us-central1-a"
-    }
-    software_config {
-      pypi_packages = {
-        scipy = "==1.1.0"
-      }
-    }
-  }
+	name = "%s"
+	region = "us-central1"
+	config {
+		node_config {
+			network    = "${google_compute_network.test.self_link}"
+			subnetwork =  "${google_compute_subnetwork.test.self_link}"
+			zone       = "us-central1-a"
+		}
+		software_config {
+			pypi_packages = {
+			  scipy = "==1.1.0"
+			}
+		}
+	}
 }
 
 // use a separate network to avoid conflicts with other tests running in parallel
 // that use the default network/subnet
 resource "google_compute_network" "test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name 					= "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "test" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.test.self_link
+	name          = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.test.self_link}"
 }
 `, name, network, subnetwork)
 }
diff --git a/google/resource_compute_address_test.go b/google/resource_compute_address_test.go
index 231eb0faeec..3ac9f49f5a0 100644
--- a/google/resource_compute_address_test.go
+++ b/google/resource_compute_address_test.go
@@ -74,12 +74,12 @@ resource "google_compute_subnetwork" "foo" {
   name          = "subnetwork-test-%s"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-east1"
-  network       = google_compute_network.default.self_link
+  network       = "${google_compute_network.default.self_link}"
 }
 
 resource "google_compute_address" "internal_with_subnet" {
   name         = "address-test-internal-with-subnet-%s"
-  subnetwork   = google_compute_subnetwork.foo.self_link
+  subnetwork   = "${google_compute_subnetwork.foo.self_link}"
   address_type = "INTERNAL"
   region       = "us-east1"
 }
@@ -88,12 +88,11 @@ resource "google_compute_address" "internal_with_subnet" {
 // default subnetwork uses.
 resource "google_compute_address" "internal_with_subnet_and_address" {
   name         = "address-test-internal-with-subnet-and-address-%s"
-  subnetwork   = google_compute_subnetwork.foo.self_link
+  subnetwork   = "${google_compute_subnetwork.foo.self_link}"
   address_type = "INTERNAL"
   address      = "10.0.42.42"
   region       = "us-east1"
-}
-`,
+}`,
 		i, // google_compute_address.internal name
 		i, // google_compute_network.default name
 		i, // google_compute_subnetwork.foo name
@@ -105,8 +104,7 @@ resource "google_compute_address" "internal_with_subnet_and_address" {
 func testAccComputeAddress_networkTier(i string) string {
 	return fmt.Sprintf(`
 resource "google_compute_address" "foobar" {
-  name         = "address-test-%s"
-  network_tier = "STANDARD"
-}
-`, i)
+	name         = "address-test-%s"
+	network_tier = "STANDARD"
+}`, i)
 }
diff --git a/google/resource_compute_attached_disk_test.go b/google/resource_compute_attached_disk_test.go
index 10bc163d62d..717d22190a0 100644
--- a/google/resource_compute_attached_disk_test.go
+++ b/google/resource_compute_attached_disk_test.go
@@ -164,33 +164,31 @@ func testCheckAttachedDiskContainsManyDisks(instanceName string, count int) reso
 func testAttachedDiskResourceAttachment() string {
 	return fmt.Sprintf(`
 resource "google_compute_attached_disk" "test" {
-  disk     = google_compute_disk.test1.self_link
-  instance = google_compute_instance.test.self_link
-}
-`)
+  disk     = "${google_compute_disk.test1.self_link}"
+  instance = "${google_compute_instance.test.self_link}"
+}`)
 }
 
 func testAttachedDiskResourceAttachmentFull() string {
 	return fmt.Sprintf(`
 resource "google_compute_attached_disk" "test" {
-  disk        = google_compute_disk.test1.self_link
-  instance    = google_compute_instance.test.self_link
+  disk        = "${google_compute_disk.test1.self_link}"
+  instance    = "${google_compute_instance.test.self_link}"
   mode        = "READ_ONLY"
   device_name = "test-device-name"
-}
-`)
+}`)
 }
 
 func testAttachedDiskResource_region(diskName, instanceName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_attached_disk" "test" {
-  disk     = google_compute_region_disk.region.self_link
-  instance = google_compute_instance.test.self_link
+  disk        = "${google_compute_region_disk.region.self_link}"
+  instance    = "${google_compute_instance.test.self_link}"
 }
 
 resource "google_compute_region_disk" "region" {
-  name          = "%s"
-  region        = "us-central1"
+  name = "%s"
+	region = "us-central1"
   replica_zones = ["us-central1-b", "us-central1-a"]
 }
 
@@ -200,7 +198,9 @@ resource "google_compute_instance" "test" {
   zone         = "us-central1-a"
 
   lifecycle {
-    ignore_changes = [attached_disk]
+    ignore_changes = [
+      "attached_disk",
+    ]
   }
 
   boot_disk {
@@ -212,8 +212,7 @@ resource "google_compute_instance" "test" {
   network_interface {
     network = "default"
   }
-}
-`, diskName, instanceName)
+}`, diskName, instanceName)
 }
 
 func testAttachedDiskResource(diskName, instanceName string) string {
@@ -230,7 +229,9 @@ resource "google_compute_instance" "test" {
   zone         = "us-central1-a"
 
   lifecycle {
-    ignore_changes = [attached_disk]
+    ignore_changes = [
+      "attached_disk",
+    ]
   }
 
   boot_disk {
@@ -242,8 +243,7 @@ resource "google_compute_instance" "test" {
   network_interface {
     network = "default"
   }
-}
-`, diskName, instanceName)
+}`, diskName, instanceName)
 }
 
 func testAttachedDiskResourceCount(diskPrefix, instanceName string, count int) string {
@@ -261,7 +261,9 @@ resource "google_compute_instance" "test" {
   zone         = "us-central1-a"
 
   lifecycle {
-    ignore_changes = [attached_disk]
+    ignore_changes = [
+      "attached_disk",
+    ]
   }
 
   boot_disk {
@@ -277,8 +279,7 @@ resource "google_compute_instance" "test" {
 
 resource "google_compute_attached_disk" "test" {
   count    = length(google_compute_disk.many)
-  disk     = google_compute_disk.many[count.index].self_link
-  instance = google_compute_instance.test.self_link
-}
-`, diskPrefix, count, instanceName)
+  disk     = "${google_compute_disk.many.*.self_link[count.index]}"
+  instance = "${google_compute_instance.test.self_link}"
+}`, diskPrefix, count, instanceName)
 }
diff --git a/google/resource_compute_autoscaler_test.go b/google/resource_compute_autoscaler_test.go
index 38789b6ad6e..430a820f983 100644
--- a/google/resource_compute_autoscaler_test.go
+++ b/google/resource_compute_autoscaler_test.go
@@ -69,47 +69,47 @@ func TestAccComputeAutoscaler_multicondition(t *testing.T) {
 func testAccComputeAutoscaler_scaffolding(it_name, tp_name, igm_name string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_target_pool" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
-  }
-  target_pools       = [google_compute_target_pool.foobar.self_link]
-  base_instance_name = "foobar"
-  zone               = "us-central1-a"
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
+	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
+	base_instance_name = "foobar"
+	zone = "us-central1-a"
 }
 `, it_name, tp_name, igm_name)
 
@@ -118,18 +118,19 @@ resource "google_compute_instance_group_manager" "foobar" {
 func testAccComputeAutoscaler_basic(it_name, tp_name, igm_name, autoscaler_name string) string {
 	return testAccComputeAutoscaler_scaffolding(it_name, tp_name, igm_name) + fmt.Sprintf(`
 resource "google_compute_autoscaler" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  zone        = "us-central1-a"
-  target      = google_compute_instance_group_manager.foobar.self_link
-  autoscaling_policy {
-    max_replicas    = 5
-    min_replicas    = 1
-    cooldown_period = 60
-    cpu_utilization {
-      target = 0.5
-    }
-  }
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	zone = "us-central1-a"
+	target = "${google_compute_instance_group_manager.foobar.self_link}"
+	autoscaling_policy {
+		max_replicas = 5
+		min_replicas = 1
+		cooldown_period = 60
+		cpu_utilization {
+			target = 0.5
+		}
+	}
+
 }
 `, autoscaler_name)
 }
@@ -137,18 +138,19 @@ resource "google_compute_autoscaler" "foobar" {
 func testAccComputeAutoscaler_update(it_name, tp_name, igm_name, autoscaler_name string) string {
 	return testAccComputeAutoscaler_scaffolding(it_name, tp_name, igm_name) + fmt.Sprintf(`
 resource "google_compute_autoscaler" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  zone        = "us-central1-a"
-  target      = google_compute_instance_group_manager.foobar.self_link
-  autoscaling_policy {
-    max_replicas    = 10
-    min_replicas    = 0
-    cooldown_period = 60
-    cpu_utilization {
-      target = 0.5
-    }
-  }
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	zone = "us-central1-a"
+	target = "${google_compute_instance_group_manager.foobar.self_link}"
+	autoscaling_policy {
+		max_replicas = 10
+		min_replicas = 0
+		cooldown_period = 60
+		cpu_utilization {
+			target = 0.5
+		}
+	}
+
 }
 `, autoscaler_name)
 }
@@ -156,31 +158,32 @@ resource "google_compute_autoscaler" "foobar" {
 func testAccComputeAutoscaler_multicondition(it_name, tp_name, igm_name, autoscaler_name string) string {
 	return testAccComputeAutoscaler_scaffolding(it_name, tp_name, igm_name) + fmt.Sprintf(`
 resource "google_compute_autoscaler" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  zone        = "us-central1-a"
-  target      = google_compute_instance_group_manager.foobar.self_link
-  autoscaling_policy {
-    max_replicas    = 10
-    min_replicas    = 1
-    cooldown_period = 60
-    cpu_utilization {
-      target = 0.5
-    }
-    load_balancing_utilization {
-      target = 0.5
-    }
-    metric {
-      name   = "compute.googleapis.com/instance/network/received_bytes_count"
-      target = 75
-      type   = "GAUGE"
-    }
-    metric {
-      name   = "compute.googleapis.com/instance/network/sent_bytes_count"
-      target = 50
-      type   = "GAUGE"
-    }
-  }
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	zone = "us-central1-a"
+	target = "${google_compute_instance_group_manager.foobar.self_link}"
+	autoscaling_policy {
+		max_replicas = 10
+		min_replicas = 1
+		cooldown_period = 60
+		cpu_utilization {
+			target = 0.5
+		}
+		load_balancing_utilization {
+			target = 0.5
+		}
+		metric {
+			name = "compute.googleapis.com/instance/network/received_bytes_count"
+			target = 75
+			type = "GAUGE"
+		}
+		metric {
+			name = "compute.googleapis.com/instance/network/sent_bytes_count"
+			target = 50
+			type = "GAUGE"
+		}
+	}
+
 }
 `, autoscaler_name)
 }
diff --git a/google/resource_compute_backend_bucket_signed_url_key_test.go b/google/resource_compute_backend_bucket_signed_url_key_test.go
index 341f1ceec75..4c5944ed508 100644
--- a/google/resource_compute_backend_bucket_signed_url_key_test.go
+++ b/google/resource_compute_backend_bucket_signed_url_key_test.go
@@ -36,13 +36,13 @@ func testAccComputeBackendBucketSignedUrlKey_basic(context map[string]interface{
 resource "google_compute_backend_bucket_signed_url_key" "backend_key" {
   name           = "test-key-%{random_suffix}"
   key_value      = "iAmAFakeKeyRandomBytes=="
-  backend_bucket = google_compute_backend_bucket.test_backend.name
+  backend_bucket = "${google_compute_backend_bucket.test_backend.name}"
 }
 
 resource "google_compute_backend_bucket" "test_backend" {
   name        = "test-signed-backend-bucket-%{random_suffix}"
   description = "Contains beautiful images"
-  bucket_name = google_storage_bucket.bucket.name
+  bucket_name = "${google_storage_bucket.bucket.name}"
   enable_cdn  = true
 }
 
diff --git a/google/resource_compute_backend_bucket_test.go b/google/resource_compute_backend_bucket_test.go
index 0f1a71f382a..4bb8686e211 100644
--- a/google/resource_compute_backend_bucket_test.go
+++ b/google/resource_compute_backend_bucket_test.go
@@ -68,7 +68,7 @@ func testAccComputeBackendBucket_basic(backendName, storageName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_bucket" "foobar" {
   name        = "%s"
-  bucket_name = google_storage_bucket.bucket_one.name
+  bucket_name = "${google_storage_bucket.bucket_one.name}"
 }
 
 resource "google_storage_bucket" "bucket_one" {
@@ -82,7 +82,7 @@ func testAccComputeBackendBucket_basicModified(backendName, bucketOne, bucketTwo
 	return fmt.Sprintf(`
 resource "google_compute_backend_bucket" "foobar" {
   name        = "%s"
-  bucket_name = google_storage_bucket.bucket_two.name
+  bucket_name = "${google_storage_bucket.bucket_two.name}"
 }
 
 resource "google_storage_bucket" "bucket_one" {
@@ -101,10 +101,10 @@ func testAccComputeBackendBucket_withCdnPolicy(backendName, storageName string)
 	return fmt.Sprintf(`
 resource "google_compute_backend_bucket" "foobar" {
   name        = "%s"
-  bucket_name = google_storage_bucket.bucket.name
+  bucket_name = "${google_storage_bucket.bucket.name}"
   enable_cdn  = true
   cdn_policy {
-    signed_url_cache_max_age_sec = 1000
+  	signed_url_cache_max_age_sec = 1000
   }
 }
 
diff --git a/google/resource_compute_backend_service_signed_url_key_test.go b/google/resource_compute_backend_service_signed_url_key_test.go
index 005c9dfd9b3..ba546e6b036 100644
--- a/google/resource_compute_backend_service_signed_url_key_test.go
+++ b/google/resource_compute_backend_service_signed_url_key_test.go
@@ -34,14 +34,14 @@ func TestAccComputeBackendServiceSignedUrlKey_basic(t *testing.T) {
 func testAccComputeBackendServiceSignedUrlKey_basic(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_backend_service_signed_url_key" "backend_key" {
-  name            = "testkey-%{random_suffix}"
-  key_value       = "iAmAFakeKeyRandomBytes=="
-  backend_service = google_compute_backend_service.test_bs.name
+  name           = "testkey-%{random_suffix}"
+  key_value      = "iAmAFakeKeyRandomBytes=="
+  backend_service = "${google_compute_backend_service.test_bs.name}"
 }
 
 resource "google_compute_backend_service" "test_bs" {
   name          = "testbs-%{random_suffix}"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
diff --git a/google/resource_compute_backend_service_test.go b/google/resource_compute_backend_service_test.go
index 19ff18a6aeb..e88f2a650db 100644
--- a/google/resource_compute_backend_service_test.go
+++ b/google/resource_compute_backend_service_test.go
@@ -254,7 +254,7 @@ func TestAccComputeBackendService_withSecurityPolicy(t *testing.T) {
 		CheckDestroy: testAccCheckComputeBackendServiceDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccComputeBackendService_withSecurityPolicy(serviceName, checkName, polName, "google_compute_security_policy.policy.self_link"),
+				Config: testAccComputeBackendService_withSecurityPolicy(serviceName, checkName, polName, "${google_compute_security_policy.policy.self_link}"),
 			},
 			{
 				ResourceName:      "google_compute_backend_service.foobar",
@@ -502,7 +502,7 @@ func testAccComputeBackendService_basic(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
   name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
@@ -518,7 +518,7 @@ func testAccComputeBackendService_withCDNEnabled(serviceName, checkName string)
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
   name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
   enable_cdn    = true
 }
 
@@ -534,22 +534,22 @@ resource "google_compute_http_health_check" "zero" {
 func testAccComputeBackendService_basicModified(serviceName, checkOne, checkTwo string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "%s"
-  health_checks = [google_compute_http_health_check.one.self_link]
+    name = "%s"
+    health_checks = ["${google_compute_http_health_check.one.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+    name = "%s"
+    request_path = "/"
+    check_interval_sec = 1
+    timeout_sec = 1
 }
 
 resource "google_compute_http_health_check" "one" {
-  name               = "%s"
-  request_path       = "/one"
-  check_interval_sec = 30
-  timeout_sec        = 30
+    name = "%s"
+    request_path = "/one"
+    check_interval_sec = 30
+    timeout_sec = 30
 }
 `, serviceName, checkOne, checkTwo)
 }
@@ -570,17 +570,17 @@ resource "google_compute_backend_service" "lipsum" {
   timeout_sec = %v
 
   backend {
-    group = google_compute_instance_group_manager.foobar.instance_group
+    group = "${google_compute_instance_group_manager.foobar.instance_group}"
   }
 
-  health_checks = [google_compute_http_health_check.default.self_link]
+  health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  name = "%s"
+  name               = "%s"
   version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
   }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
@@ -596,7 +596,7 @@ resource "google_compute_instance_template" "foobar" {
   }
 
   disk {
-    source_image = data.google_compute_image.my_image.self_link
+    source_image = "${data.google_compute_image.my_image.self_link}"
     auto_delete  = true
     boot         = true
   }
@@ -627,22 +627,22 @@ resource "google_compute_backend_service" "lipsum" {
   timeout_sec = %v
 
   backend {
-    group = google_compute_instance_group_manager.foobar.instance_group
-  }
+    group = "${google_compute_instance_group_manager.foobar.instance_group}"
+	}
 
   iap {
-    oauth2_client_id     = "test"
+    oauth2_client_id = "test"
     oauth2_client_secret = "test"
   }
 
-  health_checks = [google_compute_http_health_check.default.self_link]
+  health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  name = "%s"
+  name               = "%s"
   version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
   }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
@@ -658,7 +658,7 @@ resource "google_compute_instance_template" "foobar" {
   }
 
   disk {
-    source_image = data.google_compute_image.my_image.self_link
+    source_image = "${data.google_compute_image.my_image.self_link}"
     auto_delete  = true
     boot         = true
   }
@@ -678,7 +678,7 @@ func testAccComputeBackendService_withSessionAffinity(serviceName, checkName, de
 resource "google_compute_backend_service" "foobar" {
   name             = "%s"
   description      = "%s"
-  health_checks    = [google_compute_http_health_check.zero.self_link]
+  health_checks    = ["${google_compute_http_health_check.zero.self_link}"]
   session_affinity = "%s"
 }
 
@@ -696,12 +696,11 @@ func testAccComputeBackendService_withAffinityCookieTtlSec(serviceName, checkNam
 resource "google_compute_backend_service" "foobar" {
   name                    = "%s"
   description             = "%s"
-  health_checks           = [google_compute_http_health_check.zero.self_link]
+  health_checks           = ["${google_compute_http_health_check.zero.self_link}"]
   session_affinity        = "%s"
   affinity_cookie_ttl_sec = %v
 }
-
-resource "google_compute_http_health_check" "zero" {
+ resource "google_compute_http_health_check" "zero" {
   name               = "%s"
   request_path       = "/"
   check_interval_sec = 1
@@ -713,8 +712,8 @@ resource "google_compute_http_health_check" "zero" {
 func testAccComputeBackendService_withConnectionDraining(serviceName, checkName string, drainingTimeout int64) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name                            = "%s"
-  health_checks                   = [google_compute_http_health_check.zero.self_link]
+  name          = "%s"
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
   connection_draining_timeout_sec = %v
 }
 
@@ -731,7 +730,7 @@ func testAccComputeBackendService_withHttpsHealthCheck(serviceName, checkName st
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
   name          = "%s"
-  health_checks = [google_compute_https_health_check.zero.self_link]
+  health_checks = ["${google_compute_https_health_check.zero.self_link}"]
   protocol      = "HTTPS"
 }
 
@@ -748,7 +747,7 @@ func testAccComputeBackendService_withCdnPolicy(serviceName, checkName string) s
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
   name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 
   cdn_policy {
     cache_key_policy {
@@ -772,8 +771,8 @@ resource "google_compute_http_health_check" "zero" {
 func testAccComputeBackendService_withSecurityPolicy(serviceName, checkName, polName, polLink string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name            = "%s"
-  health_checks   = [google_compute_http_health_check.zero.self_link]
+  name          = "%s"
+  health_checks = ["${google_compute_http_health_check.zero.self_link}"]
   security_policy = "%s"
 }
 
@@ -785,8 +784,8 @@ resource "google_compute_http_health_check" "zero" {
 }
 
 resource "google_compute_security_policy" "policy" {
-  name        = "%s"
-  description = "basic security policy"
+	name        = "%s"
+	description = "basic security policy"
 }
 `, serviceName, polLink, checkName, polName)
 }
@@ -806,18 +805,18 @@ resource "google_compute_backend_service" "lipsum" {
   protocol    = "TCP"
 
   backend {
-    group           = google_compute_instance_group_manager.foobar.instance_group
+    group = "${google_compute_instance_group_manager.foobar.instance_group}"
     max_connections = %v
   }
 
-  health_checks = [google_compute_health_check.default.self_link]
+  health_checks = ["${google_compute_health_check.default.self_link}"]
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  name = "%s"
+  name               = "%s"
   version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
   }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
@@ -833,16 +832,16 @@ resource "google_compute_instance_template" "foobar" {
   }
 
   disk {
-    source_image = data.google_compute_image.my_image.self_link
+    source_image = "${data.google_compute_image.my_image.self_link}"
     auto_delete  = true
     boot         = true
   }
 }
 
 resource "google_compute_health_check" "default" {
-  name = "%s"
+  name               = "%s"
   tcp_health_check {
-    port = "110"
+      port = "110"
   }
 }
 `, serviceName, maxConnections, igName, itName, checkName)
@@ -863,18 +862,18 @@ resource "google_compute_backend_service" "lipsum" {
   protocol    = "TCP"
 
   backend {
-    group                        = google_compute_instance_group_manager.foobar.instance_group
+    group = "${google_compute_instance_group_manager.foobar.instance_group}"
     max_connections_per_instance = %v
   }
 
-  health_checks = [google_compute_health_check.default.self_link]
+  health_checks = ["${google_compute_health_check.default.self_link}"]
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  name = "%s"
+  name               = "%s"
   version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
   }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
@@ -890,16 +889,16 @@ resource "google_compute_instance_template" "foobar" {
   }
 
   disk {
-    source_image = data.google_compute_image.my_image.self_link
+    source_image = "${data.google_compute_image.my_image.self_link}"
     auto_delete  = true
     boot         = true
   }
 }
 
 resource "google_compute_health_check" "default" {
-  name = "%s"
+  name               = "%s"
   tcp_health_check {
-    port = "110"
+      port = "110"
   }
 }
 `, serviceName, maxConnectionsPerInstance, igName, itName, checkName)
@@ -915,12 +914,12 @@ resource "google_compute_backend_service" "lipsum" {
   protocol    = "TCP"
 
   backend {
-    group                        = google_compute_network_endpoint_group.lb-neg.self_link
-    balancing_mode               = "CONNECTION"
+    group = "${google_compute_network_endpoint_group.lb-neg.self_link}"
+    balancing_mode = "CONNECTION"
     max_connections_per_endpoint = %v
   }
 
-  health_checks = [google_compute_health_check.default.self_link]
+  health_checks = ["${google_compute_health_check.default.self_link}"]
 }
 
 data "google_compute_image" "my_image" {
@@ -929,41 +928,41 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance" "endpoint-instance" {
-  name         = "%s"
+  name         =  "%s"
   machine_type = "n1-standard-1"
 
   boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
+    initialize_params{
+      image = "${data.google_compute_image.my_image.self_link}"
     }
   }
 
   network_interface {
-    subnetwork = google_compute_subnetwork.default.self_link
+    subnetwork = "${google_compute_subnetwork.default.self_link}"
     access_config {
-      network_tier = "PREMIUM"
-    }
+	    network_tier = "PREMIUM"
+	}
   }
 }
 
 resource "google_compute_network_endpoint_group" "lb-neg" {
   name         = "%s"
-  network      = google_compute_network.default.self_link
-  subnetwork   = google_compute_subnetwork.default.self_link
+  network      = "${google_compute_network.default.self_link}"
+  subnetwork   = "${google_compute_subnetwork.default.self_link}"
   default_port = "90"
   zone         = "us-central1-a"
 }
 
 resource "google_compute_network_endpoint" "lb-endpoint" {
-  network_endpoint_group = google_compute_network_endpoint_group.lb-neg.name
+  network_endpoint_group = "${google_compute_network_endpoint_group.lb-neg.name}"
 
-  instance   = google_compute_instance.endpoint-instance.name
-  port       = google_compute_network_endpoint_group.lb-neg.default_port
-  ip_address = google_compute_instance.endpoint-instance.network_interface[0].network_ip
+  instance    = "${google_compute_instance.endpoint-instance.name}"
+  port        = "${google_compute_network_endpoint_group.lb-neg.default_port}"
+  ip_address  = "${google_compute_instance.endpoint-instance.network_interface.0.network_ip}"
 }
 
 resource "google_compute_network" "default" {
-  name                    = "%s"
+  name = "%s"
   auto_create_subnetworks = false
 }
 
@@ -971,13 +970,13 @@ resource "google_compute_subnetwork" "default" {
   name          = "%s"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
-  network       = google_compute_network.default.self_link
+  network       = "${google_compute_network.default.self_link}"
 }
 
 resource "google_compute_health_check" "default" {
-  name = "%s"
+  name               = "%s"
   tcp_health_check {
-    port = "110"
+      port = "110"
   }
 }
 `, service, maxConnections, instance, neg, network, network, check)
@@ -993,12 +992,12 @@ resource "google_compute_backend_service" "lipsum" {
   protocol    = "HTTPS"
 
   backend {
-    group                 = google_compute_network_endpoint_group.lb-neg.self_link
-    balancing_mode        = "RATE"
+    group = "${google_compute_network_endpoint_group.lb-neg.self_link}"
+    balancing_mode = "RATE"
     max_rate_per_endpoint = %v
   }
 
-  health_checks = [google_compute_health_check.default.self_link]
+  health_checks = ["${google_compute_health_check.default.self_link}"]
 }
 
 data "google_compute_image" "my_image" {
@@ -1007,41 +1006,41 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance" "endpoint-instance" {
-  name         = "%s"
+  name         =  "%s"
   machine_type = "n1-standard-1"
 
   boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
+    initialize_params{
+      image = "${data.google_compute_image.my_image.self_link}"
     }
   }
 
   network_interface {
-    subnetwork = google_compute_subnetwork.default.self_link
+    subnetwork = "${google_compute_subnetwork.default.self_link}"
     access_config {
       network_tier = "PREMIUM"
-    }
+	}
   }
 }
 
 resource "google_compute_network_endpoint_group" "lb-neg" {
   name         = "%s"
-  network      = google_compute_network.default.self_link
-  subnetwork   = google_compute_subnetwork.default.self_link
+  network      = "${google_compute_network.default.self_link}"
+  subnetwork   = "${google_compute_subnetwork.default.self_link}"
   default_port = "90"
   zone         = "us-central1-a"
 }
 
 resource "google_compute_network_endpoint" "lb-endpoint" {
-  network_endpoint_group = google_compute_network_endpoint_group.lb-neg.name
+  network_endpoint_group = "${google_compute_network_endpoint_group.lb-neg.name}"
 
-  instance   = google_compute_instance.endpoint-instance.name
-  port       = google_compute_network_endpoint_group.lb-neg.default_port
-  ip_address = google_compute_instance.endpoint-instance.network_interface[0].network_ip
+  instance    = "${google_compute_instance.endpoint-instance.name}"
+  port        = "${google_compute_network_endpoint_group.lb-neg.default_port}"
+  ip_address  = "${google_compute_instance.endpoint-instance.network_interface.0.network_ip}"
 }
 
 resource "google_compute_network" "default" {
-  name                    = "%s"
+  name = "%s"
   auto_create_subnetworks = false
 }
 
@@ -1049,14 +1048,14 @@ resource "google_compute_subnetwork" "default" {
   name          = "%s"
   ip_cidr_range = "10.0.0.0/16"
   region        = "us-central1"
-  network       = google_compute_network.default.self_link
+  network       = "${google_compute_network.default.self_link}"
 }
 
 resource "google_compute_health_check" "default" {
-  name                = "%s"
-  check_interval_sec  = 3
-  healthy_threshold   = 3
-  timeout_sec         = 2
+  name = "%s"
+  check_interval_sec = 3
+  healthy_threshold = 3
+  timeout_sec = 2
   unhealthy_threshold = 3
   https_health_check {
     port = "443"
diff --git a/google/resource_compute_disk_resource_policy_attachment_test.go b/google/resource_compute_disk_resource_policy_attachment_test.go
index cb1ddda195f..a70c49af16c 100644
--- a/google/resource_compute_disk_resource_policy_attachment_test.go
+++ b/google/resource_compute_disk_resource_policy_attachment_test.go
@@ -44,38 +44,37 @@ func TestAccComputeDiskResourcePolicyAttachment_basic(t *testing.T) {
 func testAccComputeDiskResourcePolicyAttachment_basic(diskName, policyName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
-  labels = {
-    my-label = "my-label-value"
-  }
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 
 resource "google_compute_resource_policy" "foobar" {
-  name = "%s"
-  region = "us-central1"
-  snapshot_schedule_policy {
-    schedule {
-      daily_schedule {
-        days_in_cycle = 1
-        start_time = "04:00"
-      }
-    }
-  }
+	name = "%s"
+	region = "us-central1"
+	snapshot_schedule_policy {
+		schedule {
+			daily_schedule {
+				days_in_cycle = 1
+				start_time = "04:00"
+			}
+		}
+	}
 }
 
 resource "google_compute_disk_resource_policy_attachment" "foobar" {
-  name = google_compute_resource_policy.foobar.name
+	name = google_compute_resource_policy.foobar.name
   disk = google_compute_disk.foobar.name
-  zone = "us-central1-a"
-}
-`, diskName, policyName)
+	zone = "us-central1-a"
+}`, diskName, policyName)
 }
diff --git a/google/resource_compute_disk_test.go b/google/resource_compute_disk_test.go
index 36fe514520d..42c931ee52b 100644
--- a/google/resource_compute_disk_test.go
+++ b/google/resource_compute_disk_test.go
@@ -478,121 +478,116 @@ func testAccCheckEncryptionKey(n string, disk *compute.Disk) resource.TestCheckF
 func testAccComputeDisk_basic(diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
-  labels = {
-    my-label = "my-label-value"
-  }
-}
-`, diskName)
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	labels = {
+		my-label = "my-label-value"
+	}
+}`, diskName)
 }
 
 func testAccComputeDisk_timeout(diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name  = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	type  = "pd-ssd"
+	zone  = "us-central1-a"
 
-  timeouts {
-    create = "1s"
-  }
-}
-`, diskName)
+	timeouts {
+		create = "1s"
+	}
+}`, diskName)
 }
 
 func testAccComputeDisk_updated(diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 100
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
-  labels = {
-    my-label    = "my-updated-label-value"
-    a-new-label = "a-new-label-value"
-  }
-}
-`, diskName)
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 100
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	labels = {
+		my-label = "my-updated-label-value"
+		a-new-label = "a-new-label-value"
+	}
+}`, diskName)
 }
 
 func testAccComputeDisk_fromSnapshot(projectName, firstDiskName, snapshotName, diskName, ref_selector string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name    = "d1-%s"
-  image   = data.google_compute_image.my_image.self_link
-  size    = 50
-  type    = "pd-ssd"
-  zone    = "us-central1-a"
-  project = "%s"
+	name = "d1-%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	project = "%s"
 }
 
 resource "google_compute_snapshot" "snapdisk" {
-  name        = "%s"
-  source_disk = google_compute_disk.foobar.name
-  zone        = "us-central1-a"
-  project     = "%s"
+	name = "%s"
+	source_disk = "${google_compute_disk.foobar.name}"
+	zone = "us-central1-a"
+	project = "%s"
 }
 
 resource "google_compute_disk" "seconddisk" {
-  name     = "d2-%s"
-  snapshot = google_compute_snapshot.snapdisk.%s
-  type     = "pd-ssd"
-  zone     = "us-central1-a"
-  project  = "%s"
-}
-`, firstDiskName, projectName, snapshotName, projectName, diskName, ref_selector, projectName)
+	name = "d2-%s"
+	snapshot = "${google_compute_snapshot.snapdisk.%s}"
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	project = "%s"
+}`, firstDiskName, projectName, snapshotName, projectName, diskName, ref_selector, projectName)
 }
 
 func testAccComputeDisk_encryption(diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
-  disk_encryption_key {
-    raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
-  }
-}
-`, diskName)
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	disk_encryption_key {
+		raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
+	}
+}`, diskName)
 }
 
 func testAccComputeDisk_encryptionKMS(pid, diskName, kmsKey string) string {
 	return fmt.Sprintf(`
 data "google_project" "project" {
-  project_id = "%s"
+	project_id = "%s"
 }
 
 data "google_compute_image" "my_image" {
@@ -601,7 +596,7 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
+  project = "${data.google_project.project.project_id}"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
   member  = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
 }
@@ -609,11 +604,11 @@ resource "google_project_iam_member" "kms-project-binding" {
 resource "google_compute_disk" "foobar" {
   depends_on = [google_project_iam_member.kms-project-binding]
 
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+  name    = "%s"
+  image   = "${data.google_compute_image.my_image.self_link}"
+  size    = 10
+  type    = "pd-ssd"
+  zone    = "us-central1-a"
 
   disk_encryption_key {
     kms_key_self_link = "%s"
@@ -625,91 +620,89 @@ resource "google_compute_disk" "foobar" {
 func testAccComputeDisk_deleteDetach(instanceName, diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foo" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "bar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	zone = "us-central1-a"
 
-  attached_disk {
-    source = google_compute_disk.foo.self_link
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
-}
-`, diskName, instanceName)
+	attached_disk {
+		source = "${google_compute_disk.foo.self_link}"
+	}
+
+	network_interface {
+		network = "default"
+	}
+}`, diskName, instanceName)
 }
 
 func testAccComputeDisk_deleteDetachIGM(diskName, mgrName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foo" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "template" {
-  machine_type = "g1-small"
+	machine_type = "g1-small"
 
-  disk {
-    boot        = true
-    source      = google_compute_disk.foo.name
-    auto_delete = false
-  }
+	disk {
+		boot        = true
+		source      = "${google_compute_disk.foo.name}"
+		auto_delete = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  lifecycle {
-    create_before_destroy = true
-  }
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_instance_group_manager" "manager" {
   name               = "%s"
   base_instance_name = "disk-igm"
   version {
-    instance_template = google_compute_instance_template.template.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.template.self_link}"
+    name               = "primary"
   }
   update_policy {
     minimal_action        = "RESTART"
     type                  = "PROACTIVE"
     max_unavailable_fixed = 1
   }
-  zone        = "us-central1-a"
-  target_size = 1
+  zone               = "us-central1-a"
+  target_size        = 1
 
   // block on instances being ready so that when they get deleted, we don't try
   // to continue interacting with them in other resources
   wait_for_instances = true
-}
-`, diskName, mgrName)
+}`, diskName, mgrName)
 }
diff --git a/google/resource_compute_firewall_test.go b/google/resource_compute_firewall_test.go
index 7c7588f113c..f8acc08e83b 100644
--- a/google/resource_compute_firewall_test.go
+++ b/google/resource_compute_firewall_test.go
@@ -198,177 +198,169 @@ func TestAccComputeFirewall_disabled(t *testing.T) {
 
 func testAccComputeFirewall_basic(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
-  source_tags = ["foo"]
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
+		source_tags = ["foo"]
 
-  allow {
-    protocol = "icmp"
-  }
-}
-`, network, firewall)
+		allow {
+			protocol = "icmp"
+		}
+	}`, network, firewall)
 }
 
 func testAccComputeFirewall_update(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.self_link
-  source_tags = ["foo"]
-  target_tags = ["bar"]
-
-  allow {
-    protocol = "tcp"
-    ports    = ["80-255"]
-  }
-}
-`, network, firewall)
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.self_link}"
+		source_tags = ["foo"]
+		target_tags = ["bar"]
+
+		allow {
+			protocol = "tcp"
+			ports = ["80-255"]
+		}
+	}`, network, firewall)
 }
 
 func testAccComputeFirewall_priority(network, firewall string, priority int) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
-  source_tags = ["foo"]
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
+		source_tags = ["foo"]
 
-  allow {
-    protocol = "icmp"
-  }
-  priority = %d
-}
-`, network, firewall, priority)
+		allow {
+			protocol = "icmp"
+		}
+		priority = %d
+	}`, network, firewall, priority)
 }
 
 func testAccComputeFirewall_noSource(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
 
-  allow {
-    protocol = "tcp"
-    ports    = [22]
-  }
-}
-`, network, firewall)
+		allow {
+			protocol = "tcp"
+			ports    = [22]
+		}
+	}`, network, firewall)
 }
 
 func testAccComputeFirewall_denied(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
-  source_tags = ["foo"]
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
+		source_tags = ["foo"]
 
-  deny {
-    protocol = "tcp"
-    ports    = [22]
-  }
-}
-`, network, firewall)
+		deny {
+			protocol = "tcp"
+			ports    = [22]
+		}
+	}`, network, firewall)
 }
 
 func testAccComputeFirewall_egress(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  direction   = "EGRESS"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		direction = "EGRESS"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
 
-  allow {
-    protocol = "tcp"
-    ports    = [22]
-  }
-}
-`, network, firewall)
+		allow {
+			protocol = "tcp"
+			ports    = [22]
+		}
+	}`, network, firewall)
 }
 
 func testAccComputeFirewall_serviceAccounts(sourceSa, targetSa, network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_service_account" "source" {
-  account_id = "%s"
-}
+	resource "google_service_account" "source" {
+		account_id = "%s"
+	}
 
-resource "google_service_account" "target" {
-  account_id = "%s"
-}
+	resource "google_service_account" "target" {
+		account_id = "%s"
+	}
 
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
 
-  allow {
-    protocol = "icmp"
-  }
+		allow {
+			protocol = "icmp"
+		}
 
-  source_service_accounts = [google_service_account.source.email]
-  target_service_accounts = [google_service_account.target.email]
-}
-`, sourceSa, targetSa, network, firewall)
+		source_service_accounts = ["${google_service_account.source.email}"]
+		target_service_accounts = ["${google_service_account.target.email}"]
+	}`, sourceSa, targetSa, network, firewall)
 }
 
 func testAccComputeFirewall_disabled(network, firewall string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_firewall" "foobar" {
-  name        = "%s"
-  description = "Resource created for Terraform acceptance testing"
-  network     = google_compute_network.foobar.name
-  source_tags = ["foo"]
-
-  allow {
-    protocol = "icmp"
-  }
-
-  disabled = true
-}
-`, network, firewall)
+	resource "google_compute_network" "foobar" {
+		name = "%s"
+		auto_create_subnetworks = false
+	}
+
+	resource "google_compute_firewall" "foobar" {
+		name = "%s"
+		description = "Resource created for Terraform acceptance testing"
+		network = "${google_compute_network.foobar.name}"
+		source_tags = ["foo"]
+
+		allow {
+			protocol = "icmp"
+		}
+
+		disabled = true
+	}`, network, firewall)
 }
diff --git a/google/resource_compute_forwarding_rule_test.go b/google/resource_compute_forwarding_rule_test.go
index e3e8557e2f4..b0e11e97021 100644
--- a/google/resource_compute_forwarding_rule_test.go
+++ b/google/resource_compute_forwarding_rule_test.go
@@ -94,13 +94,12 @@ resource "google_compute_target_pool" "foo-tp" {
   instances   = ["us-central1-a/foo", "us-central1-b/bar"]
   name        = "foo-%s"
 }
-
 resource "google_compute_forwarding_rule" "foobar" {
   description = "Resource created for Terraform acceptance testing"
   ip_protocol = "UDP"
   name        = "%s"
   port_range  = "80-81"
-  target      = google_compute_target_pool.foo-tp.self_link
+  target      = "${google_compute_target_pool.foo-tp.self_link}"
 }
 `, poolName, ruleName)
 }
@@ -112,19 +111,17 @@ resource "google_compute_target_pool" "foo-tp" {
   instances   = ["us-central1-a/foo", "us-central1-b/bar"]
   name        = "foo-%s"
 }
-
 resource "google_compute_target_pool" "bar-tp" {
   description = "Resource created for Terraform acceptance testing"
   instances   = ["us-central1-a/foo", "us-central1-b/bar"]
   name        = "bar-%s"
 }
-
 resource "google_compute_forwarding_rule" "foobar" {
   description = "Resource created for Terraform acceptance testing"
   ip_protocol = "UDP"
   name        = "%s"
   port_range  = "80-81"
-  target      = google_compute_target_pool.bar-tp.self_link
+  target      = "${google_compute_target_pool.bar-tp.self_link}"
 }
 `, poolName, poolName, ruleName)
 }
@@ -134,20 +131,18 @@ func testAccComputeForwardingRule_ip(addrName, poolName, ruleName string) string
 resource "google_compute_address" "foo" {
   name = "%s"
 }
-
 resource "google_compute_target_pool" "foobar-tp" {
   description = "Resource created for Terraform acceptance testing"
   instances   = ["us-central1-a/foo", "us-central1-b/bar"]
   name        = "%s"
 }
-
 resource "google_compute_forwarding_rule" "foobar" {
   description = "Resource created for Terraform acceptance testing"
-  ip_address  = google_compute_address.foo.address
+  ip_address  = "${google_compute_address.foo.address}"
   ip_protocol = "TCP"
   name        = "%s"
   port_range  = "80-81"
-  target      = google_compute_target_pool.foobar-tp.self_link
+  target      = "${google_compute_target_pool.foobar-tp.self_link}"
 }
 `, addrName, poolName, ruleName)
 }
@@ -159,13 +154,12 @@ resource "google_compute_target_pool" "foobar-tp" {
   instances   = ["us-central1-a/foo", "us-central1-b/bar"]
   name        = "%s"
 }
-
 resource "google_compute_forwarding_rule" "foobar" {
   description = "Resource created for Terraform acceptance testing"
   ip_protocol = "UDP"
   name        = "%s"
   port_range  = "80-81"
-  target      = google_compute_target_pool.foobar-tp.self_link
+  target      = "${google_compute_target_pool.foobar-tp.self_link}"
 
   network_tier = "STANDARD"
 }
diff --git a/google/resource_compute_global_address_test.go b/google/resource_compute_global_address_test.go
index eaa06f0c61b..d58b37cc225 100644
--- a/google/resource_compute_global_address_test.go
+++ b/google/resource_compute_global_address_test.go
@@ -51,11 +51,10 @@ func TestAccComputeGlobalAddress_internal(t *testing.T) {
 func testAccComputeGlobalAddress_ipv6() string {
 	return fmt.Sprintf(`
 resource "google_compute_global_address" "foobar" {
-  name        = "address-test-%s"
-  description = "Created for Terraform acceptance testing"
-  ip_version  = "IPV6"
-}
-`, acctest.RandString(10))
+	name = "address-test-%s"
+	description = "Created for Terraform acceptance testing"
+	ip_version = "IPV6"
+}`, acctest.RandString(10))
 }
 
 func testAccComputeGlobalAddress_internal() string {
@@ -64,13 +63,13 @@ resource "google_compute_network" "foobar" {
   name = "address-test-%s"
 }
 
+
 resource "google_compute_global_address" "foobar" {
-  name          = "address-test-%s"
-  address_type  = "INTERNAL"
-  purpose       = "VPC_PEERING"
+  name = "address-test-%s"
+  address_type = "INTERNAL"
+  purpose = "VPC_PEERING"
   prefix_length = 24
-  address       = "172.20.181.0"
-  network       = google_compute_network.foobar.self_link
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	address = "172.20.181.0"
+  network = "${google_compute_network.foobar.self_link}"
+}`, acctest.RandString(10), acctest.RandString(10))
 }
diff --git a/google/resource_compute_global_forwarding_rule_test.go b/google/resource_compute_global_forwarding_rule_test.go
index cfb8a1c4e40..6cd1dc0b0ad 100644
--- a/google/resource_compute_global_forwarding_rule_test.go
+++ b/google/resource_compute_global_forwarding_rule_test.go
@@ -84,111 +84,109 @@ func TestAccComputeGlobalForwardingRule_ipv6(t *testing.T) {
 
 func testAccComputeGlobalForwardingRule_httpProxy(fr, targetProxy, proxy, proxy2, backend, hc, urlmap string) string {
 	return fmt.Sprintf(`
-resource "google_compute_global_forwarding_rule" "forwarding_rule" {
-  description = "Resource created for Terraform acceptance testing"
-  ip_protocol = "TCP"
-  name        = "%s"
-  port_range  = "80"
-  target      = google_compute_target_http_proxy.%s.self_link
-}
-
-resource "google_compute_target_http_proxy" "proxy" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  url_map     = google_compute_url_map.url_map.self_link
-}
-
-resource "google_compute_target_http_proxy" "proxy2" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  url_map     = google_compute_url_map.url_map.self_link
-}
-
-resource "google_compute_backend_service" "backend" {
-  name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
-}
-
-resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
-}
-
-resource "google_compute_url_map" "url_map" {
-  name            = "%s"
-  default_service = google_compute_backend_service.backend.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.backend.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.backend.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.backend.self_link
-  }
-}
-`, fr, targetProxy, proxy, proxy2, backend, hc, urlmap)
+	resource "google_compute_global_forwarding_rule" "forwarding_rule" {
+		description = "Resource created for Terraform acceptance testing"
+		ip_protocol = "TCP"
+		name = "%s"
+		port_range = "80"
+		target = "${google_compute_target_http_proxy.%s.self_link}"
+	}
+
+	resource "google_compute_target_http_proxy" "proxy" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		url_map = "${google_compute_url_map.url_map.self_link}"
+	}
+
+	resource "google_compute_target_http_proxy" "proxy2" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		url_map = "${google_compute_url_map.url_map.self_link}"
+	}
+
+	resource "google_compute_backend_service" "backend" {
+		name = "%s"
+		health_checks = ["${google_compute_http_health_check.zero.self_link}"]
+	}
+
+	resource "google_compute_http_health_check" "zero" {
+		name = "%s"
+		request_path = "/"
+		check_interval_sec = 1
+		timeout_sec = 1
+	}
+
+	resource "google_compute_url_map" "url_map" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.backend.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.backend.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.backend.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.backend.self_link}"
+		}
+	}`, fr, targetProxy, proxy, proxy2, backend, hc, urlmap)
 }
 
 func testAccComputeGlobalForwardingRule_ipv6(fr, proxy, backend, hc, urlmap string) string {
 	return fmt.Sprintf(`
-resource "google_compute_global_forwarding_rule" "forwarding_rule" {
-  description = "Resource created for Terraform acceptance testing"
-  ip_protocol = "TCP"
-  name        = "%s"
-  port_range  = "80"
-  target      = google_compute_target_http_proxy.proxy.self_link
-  ip_version  = "IPV6"
-}
-
-resource "google_compute_target_http_proxy" "proxy" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  url_map     = google_compute_url_map.urlmap.self_link
-}
-
-resource "google_compute_backend_service" "backend" {
-  name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
-}
-
-resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
-}
-
-resource "google_compute_url_map" "urlmap" {
-  name            = "%s"
-  default_service = google_compute_backend_service.backend.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.backend.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.backend.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.backend.self_link
-  }
-}
-`, fr, proxy, backend, hc, urlmap)
+	resource "google_compute_global_forwarding_rule" "forwarding_rule" {
+		description = "Resource created for Terraform acceptance testing"
+		ip_protocol = "TCP"
+		name = "%s"
+		port_range = "80"
+		target = "${google_compute_target_http_proxy.proxy.self_link}"
+		ip_version = "IPV6"
+	}
+
+	resource "google_compute_target_http_proxy" "proxy" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		url_map = "${google_compute_url_map.urlmap.self_link}"
+	}
+
+	resource "google_compute_backend_service" "backend" {
+		name = "%s"
+		health_checks = ["${google_compute_http_health_check.zero.self_link}"]
+	}
+
+	resource "google_compute_http_health_check" "zero" {
+		name = "%s"
+		request_path = "/"
+		check_interval_sec = 1
+		timeout_sec = 1
+	}
+
+	resource "google_compute_url_map" "urlmap" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.backend.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.backend.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.backend.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.backend.self_link}"
+		}
+	}`, fr, proxy, backend, hc, urlmap)
 }
diff --git a/google/resource_compute_health_check_test.go b/google/resource_compute_health_check_test.go
index cb224201e25..b1c0b3f7b0e 100644
--- a/google/resource_compute_health_check_test.go
+++ b/google/resource_compute_health_check_test.go
@@ -157,15 +157,15 @@ func TestAccComputeHealthCheck_tcpAndSsl_shouldFail(t *testing.T) {
 func testAccComputeHealthCheck_tcp(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  tcp_health_check {
-    port = 443
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	tcp_health_check {
+		port = 443
+	}
 }
 `, hckName)
 }
@@ -173,15 +173,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_tcp_update(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource updated for Terraform acceptance testing"
-  healthy_threshold   = 10
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 10
-  tcp_health_check {
-    port = "8080"
-  }
+	check_interval_sec = 3
+	description = "Resource updated for Terraform acceptance testing"
+	healthy_threshold = 10
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 10
+	tcp_health_check {
+		port = "8080"
+	}
 }
 `, hckName)
 }
@@ -189,15 +189,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_ssl(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  ssl_health_check {
-    port = "443"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	ssl_health_check {
+		port = "443"
+	}
 }
 `, hckName)
 }
@@ -205,16 +205,16 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_ssl_fixed_port(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  ssl_health_check {
-    port               = "443"
-    port_specification = "USE_FIXED_PORT"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	ssl_health_check {
+		port = "443"
+		port_specification = "USE_FIXED_PORT"
+	}
 }
 `, hckName)
 }
@@ -222,15 +222,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_http(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  http_health_check {
-    port = "80"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	http_health_check {
+		port = "80"
+	}
 }
 `, hckName)
 }
@@ -238,15 +238,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_http_port_spec(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  http_health_check {
-    port_specification = "USE_NAMED_PORT"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	http_health_check {
+		port_specification = "USE_NAMED_PORT"
+	}
 }
 `, hckName)
 }
@@ -254,16 +254,16 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_http_named_port(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  http_health_check {
-    port_name          = "http"
-    port_specification = "USE_NAMED_PORT"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	http_health_check {
+		port_name = "http"
+		port_specification = "USE_NAMED_PORT"
+	}
 }
 `, hckName)
 }
@@ -271,15 +271,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_https(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  https_health_check {
-    port = "443"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	https_health_check {
+		port = "443"
+	}
 }
 `, hckName)
 }
@@ -287,15 +287,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_https_serving_port(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  https_health_check {
-    port_specification = "USE_SERVING_PORT"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	https_health_check {
+		port_specification = "USE_SERVING_PORT"
+	}
 }
 `, hckName)
 }
@@ -303,15 +303,15 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_http2(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-  http2_health_check {
-    port = "443"
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+	http2_health_check {
+		port = "443"
+	}
 }
 `, hckName)
 }
@@ -319,19 +319,19 @@ resource "google_compute_health_check" "foobar" {
 func testAccComputeHealthCheck_tcpAndSsl_shouldFail(hckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_health_check" "foobar" {
-  check_interval_sec  = 3
-  description         = "Resource created for Terraform acceptance testing"
-  healthy_threshold   = 3
-  name                = "health-test-%s"
-  timeout_sec         = 2
-  unhealthy_threshold = 3
-
-  tcp_health_check {
-    port = 443
-  }
-  ssl_health_check {
-    port = 443
-  }
+	check_interval_sec = 3
+	description = "Resource created for Terraform acceptance testing"
+	healthy_threshold = 3
+	name = "health-test-%s"
+	timeout_sec = 2
+	unhealthy_threshold = 3
+
+	tcp_health_check {
+		port = 443
+	}
+	ssl_health_check {
+		port = 443
+	}
 }
 `, hckName)
 }
diff --git a/google/resource_compute_http_health_check_test.go b/google/resource_compute_http_health_check_test.go
index aefee40471a..cd18b78846c 100644
--- a/google/resource_compute_http_health_check_test.go
+++ b/google/resource_compute_http_health_check_test.go
@@ -104,9 +104,9 @@ func testAccCheckComputeHttpHealthCheckThresholds(healthy, unhealthy int64, heal
 func testAccComputeHttpHealthCheck_update1(hhckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_http_health_check" "foobar" {
-  name         = "%s"
-  description  = "Resource created for Terraform acceptance testing"
-  request_path = "/not_default"
+	name = "%s"
+	description = "Resource created for Terraform acceptance testing"
+	request_path = "/not_default"
 }
 `, hhckName)
 }
@@ -114,10 +114,10 @@ resource "google_compute_http_health_check" "foobar" {
 func testAccComputeHttpHealthCheck_update2(hhckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_http_health_check" "foobar" {
-  name                = "%s"
-  description         = "Resource updated for Terraform acceptance testing"
-  healthy_threshold   = 10
-  unhealthy_threshold = 10
+	name = "%s"
+	description = "Resource updated for Terraform acceptance testing"
+	healthy_threshold = 10
+	unhealthy_threshold = 10
 }
 `, hhckName)
 }
diff --git a/google/resource_compute_https_health_check_test.go b/google/resource_compute_https_health_check_test.go
index 84e69ff6e84..fbb3646ce7a 100644
--- a/google/resource_compute_https_health_check_test.go
+++ b/google/resource_compute_https_health_check_test.go
@@ -41,9 +41,9 @@ func TestAccComputeHttpsHealthCheck_update(t *testing.T) {
 func testAccComputeHttpsHealthCheck_update1(hhckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_https_health_check" "foobar" {
-  name         = "%s"
-  description  = "Resource created for Terraform acceptance testing"
-  request_path = "/not_default"
+	name = "%s"
+	description = "Resource created for Terraform acceptance testing"
+	request_path = "/not_default"
 }
 `, hhckName)
 }
@@ -51,10 +51,10 @@ resource "google_compute_https_health_check" "foobar" {
 func testAccComputeHttpsHealthCheck_update2(hhckName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_https_health_check" "foobar" {
-  name                = "%s"
-  description         = "Resource updated for Terraform acceptance testing"
-  healthy_threshold   = 10
-  unhealthy_threshold = 10
+	name = "%s"
+	description = "Resource updated for Terraform acceptance testing"
+	healthy_threshold = 10
+	unhealthy_threshold = 10
 }
 `, hhckName)
 }
diff --git a/google/resource_compute_image_test.go b/google/resource_compute_image_test.go
index ec9bce49e5c..336a6eb931b 100644
--- a/google/resource_compute_image_test.go
+++ b/google/resource_compute_image_test.go
@@ -273,20 +273,19 @@ func testAccCheckComputeImageHasSourceDisk(image *compute.Image) resource.TestCh
 func testAccComputeImage_resolving(name, family string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name = "%s"
+	zone = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
-
 resource "google_compute_image" "foobar" {
-  name        = "%s"
-  family      = "%s"
-  source_disk = google_compute_disk.foobar.self_link
+	name = "%s"
+	family = "%s"
+	source_disk = "${google_compute_disk.foobar.self_link}"
 }
 `, name, name, family)
 }
@@ -294,82 +293,78 @@ resource "google_compute_image" "foobar" {
 func testAccComputeImage_basic(name string) string {
 	return fmt.Sprintf(`
 resource "google_compute_image" "foobar" {
-  name        = "%s"
-  description = "description-test"
-  family      = "family-test"
-  raw_disk {
-    source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
-  }
-  labels = {
-    my-label    = "my-label-value"
-    empty-label = ""
-  }
-}
-`, name)
+	name = "%s"
+	description = "description-test"
+	family = "family-test"
+	raw_disk {
+	  source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
+	}
+	labels = {
+		my-label = "my-label-value"
+		empty-label = ""
+	}
+}`, name)
 }
 
 func testAccComputeImage_license(name string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "disk-test-%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name = "disk-test-%s"
+	zone = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
 
 resource "google_compute_image" "foobar" {
-  name        = "%s"
-  description = "description-test"
-  source_disk = google_compute_disk.foobar.self_link
-
-  labels = {
-    my-label    = "my-label-value"
-    empty-label = ""
-  }
-  licenses = [
-    "https://www.googleapis.com/compute/v1/projects/debian-cloud/global/licenses/debian-9-stretch",
-  ]
-}
-`, name, name)
+	name = "%s"
+	description = "description-test"
+	source_disk = "${google_compute_disk.foobar.self_link}"
+
+	labels = {
+		my-label = "my-label-value"
+		empty-label = ""
+	}
+	licenses = [
+		"https://www.googleapis.com/compute/v1/projects/debian-cloud/global/licenses/debian-9-stretch",
+	]
+}`, name, name)
 }
 
 func testAccComputeImage_update(name string) string {
 	return fmt.Sprintf(`
 resource "google_compute_image" "foobar" {
-  name        = "%s"
-  description = "description-test"
-  family      = "family-test"
-  raw_disk {
-    source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
-  }
-  labels = {
-    empty-label = "oh-look-theres-a-label-now"
-    new-field   = "only-shows-up-when-updated"
-  }
-}
-`, name)
+	name = "%s"
+	description = "description-test"
+	family = "family-test"
+	raw_disk {
+	  source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
+	}
+	labels = {
+		empty-label = "oh-look-theres-a-label-now"
+		new-field = "only-shows-up-when-updated"
+	}
+}`, name)
 }
 
 func testAccComputeImage_basedondisk() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "disk-test-%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name = "disk-test-%s"
+	zone = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
 
 resource "google_compute_image" "foobar" {
-  name        = "image-test-%s"
-  source_disk = google_compute_disk.foobar.self_link
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	name = "image-test-%s"
+	source_disk = "${google_compute_disk.foobar.self_link}"
+}`, acctest.RandString(10), acctest.RandString(10))
 }
diff --git a/google/resource_compute_instance_from_template_test.go b/google/resource_compute_instance_from_template_test.go
index 0309417fcfa..283fa38e367 100644
--- a/google/resource_compute_instance_from_template_test.go
+++ b/google/resource_compute_instance_from_template_test.go
@@ -213,71 +213,71 @@ func testAccCheckComputeInstanceFromTemplateDestroy(s *terraform.State) error {
 func testAccComputeInstanceFromTemplate_basic(instance, template string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
 
-  disk {
-    source      = google_compute_disk.foobar.name
-    auto_delete = false
-    boot        = false
-  }
+	disk {
+		source = "${google_compute_disk.foobar.name}"
+		auto_delete = false
+		boot = false
+	}
 
-  disk {
-    disk_type    = "local-ssd"
-    type         = "SCRATCH"
-    interface    = "NVME"
-    disk_size_gb = 375
-  }
+	disk {
+		disk_type = "local-ssd"
+		type = "SCRATCH"
+		interface = "NVME"
+		disk_size_gb = 375
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  scheduling {
-    automatic_restart = true
-  }
+	scheduling {
+		automatic_restart = true
+	}
 
-  can_ip_forward = true
+	can_ip_forward = true
 }
 
 resource "google_compute_instance_from_template" "foobar" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.foobar.self_link
+	source_instance_template = "${google_compute_instance_template.foobar.self_link}"
 
-  // Overrides
-  can_ip_forward = false
-  labels = {
-    my_key = "my_value"
-  }
-  scheduling {
-    automatic_restart = false
-  }
+	// Overrides
+	can_ip_forward = false
+	labels = {
+		my_key       = "my_value"
+	}
+	scheduling {
+		automatic_restart = false
+	}
 }
 `, template, template, instance)
 }
@@ -285,64 +285,64 @@ resource "google_compute_instance_from_template" "foobar" {
 func testAccComputeInstanceFromTemplate_overrideBootDisk(templateDisk, overrideDisk, template, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "template_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_disk" "override_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 20
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 20
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "template" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
 
-  disk {
-    source      = google_compute_disk.template_disk.name
-    auto_delete = false
-    boot        = false
-  }
+	disk {
+		source = "${google_compute_disk.template_disk.name}"
+		auto_delete = false
+		boot = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  can_ip_forward = true
+	can_ip_forward = true
 }
 
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.template.self_link
+	source_instance_template = "${google_compute_instance_template.template.self_link}"
 
-  // Overrides
-  boot_disk {
-    source = google_compute_disk.override_disk.self_link
-  }
+	// Overrides
+	boot_disk {
+		source = "${google_compute_disk.override_disk.self_link}"
+	}
 }
 `, templateDisk, overrideDisk, template, instance)
 }
@@ -350,64 +350,64 @@ resource "google_compute_instance_from_template" "inst" {
 func testAccComputeInstanceFromTemplate_overrideAttachedDisk(templateDisk, overrideDisk, template, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "template_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_disk" "override_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 20
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 20
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "template" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
 
-  disk {
-    source      = google_compute_disk.template_disk.name
-    auto_delete = false
-    boot        = false
-  }
+	disk {
+		source = "${google_compute_disk.template_disk.name}"
+		auto_delete = false
+		boot = false
+	}
 
-  disk {
-    source_image = "debian-cloud/debian-9"
-    auto_delete  = true
-    boot         = false
-  }
+	disk {
+		source_image = "debian-cloud/debian-9"
+		auto_delete = true
+		boot = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.template.self_link
+	source_instance_template = "${google_compute_instance_template.template.self_link}"
 
-  // Overrides
-  attached_disk {
-    source = google_compute_disk.override_disk.name
-  }
+	// Overrides
+	attached_disk {
+		source = "${google_compute_disk.override_disk.name}"
+	}
 }
 `, templateDisk, overrideDisk, template, instance)
 }
@@ -415,61 +415,61 @@ resource "google_compute_instance_from_template" "inst" {
 func testAccComputeInstanceFromTemplate_overrideScratchDisk(templateDisk, overrideDisk, template, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "template_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_disk" "override_disk" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 20
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 20
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "template" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
-
-  disk {
-    type         = "SCRATCH"
-    disk_type    = "local-ssd"
-    disk_size_gb = 375
-    interface    = "SCSI"
-    auto_delete  = true
-    boot         = false
-  }
-
-  network_interface {
-    network = "default"
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
+
+	disk {
+		type = "SCRATCH"
+		disk_type = "local-ssd"
+		disk_size_gb = 375
+		interface = "SCSI"
+		auto_delete = true
+		boot = false
+	}
+
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.template.self_link
+	source_instance_template = "${google_compute_instance_template.template.self_link}"
 
-  // Overrides
-  scratch_disk {
-    interface = "NVME"
-  }
+	// Overrides
+	scratch_disk {
+		interface = "NVME"
+	}
 }
 `, templateDisk, overrideDisk, template, instance)
 }
@@ -478,34 +478,34 @@ func testAccComputeInstanceFromTemplate_012_removableFieldsTpl(template string)
 
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 20
-    boot         = true
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 20
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 
-  can_ip_forward = true
+	can_ip_forward = true
 }
 `, template)
 }
@@ -513,12 +513,12 @@ resource "google_compute_instance_template" "foobar" {
 func testAccComputeInstanceFromTemplate_012_removableFields1(instance string) string {
 	return fmt.Sprintf(`
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 
-  source_instance_template = google_compute_instance_template.foobar.self_link
+	source_instance_template = "${google_compute_instance_template.foobar.self_link}"
 }
 `, instance)
 }
@@ -526,28 +526,28 @@ resource "google_compute_instance_from_template" "inst" {
 func testAccComputeInstanceFromTemplate_012_removableFields2(instance string) string {
 	return fmt.Sprintf(`
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name           = "%s"
+	zone           = "us-central1-a"
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 
-  source_instance_template = google_compute_instance_template.foobar.self_link
+	source_instance_template = "${google_compute_instance_template.foobar.self_link}"
 
-  // Overrides
-  network_interface {
-    alias_ip_range = []
-  }
+	// Overrides
+	network_interface {
+		alias_ip_range = []
+	}
 
-  service_account = []
+	service_account = []
 
-  scratch_disk = []
+	scratch_disk = []
 
-  attached_disk = []
+	attached_disk = []
 
-  timeouts {
-    create = "10m"
-    update = "10m"
-  }
+	timeouts {
+		create = "10m"
+		update = "10m"
+	}
 }
 `, instance)
 }
@@ -555,41 +555,41 @@ resource "google_compute_instance_from_template" "inst" {
 func testAccComputeInstanceFromTemplate_overrideMetadataDotStartupScript(instance, template string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
+	name = "%s"
+	machine_type = "n1-standard-1"
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    startup-script = "#!/bin/bash\necho Hello"
-  }
+	metadata = {
+		startup-script = "#!/bin/bash\necho Hello"
+	}
 
-  can_ip_forward = true
+	can_ip_forward = true
 }
 
 resource "google_compute_instance_from_template" "inst" {
-  name = "%s"
-  zone = "us-central1-a"
+	name = "%s"
+	zone = "us-central1-a"
 
-  source_instance_template = google_compute_instance_template.foobar.self_link
+	source_instance_template = "${google_compute_instance_template.foobar.self_link}"
 
-  // Overrides
-  metadata = {
-    startup-script = ""
-  }
+	// Overrides
+	metadata = {
+		startup-script = ""
+	}
 }
 `, template, instance)
 }
diff --git a/google/resource_compute_instance_group_manager_test.go b/google/resource_compute_instance_group_manager_test.go
index 44a24c599e4..f4c29d6b4ac 100644
--- a/google/resource_compute_instance_group_manager_test.go
+++ b/google/resource_compute_instance_group_manager_test.go
@@ -279,747 +279,732 @@ func testAccCheckInstanceGroupManagerDestroy(s *terraform.State) error {
 
 func testAccInstanceGroupManager_basic(template, target, igm1, igm2 string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
-
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-  target_size        = 2
-}
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_target_pool" "igm-basic" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
 
-resource "google_compute_instance_group_manager" "igm-no-tp" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+	resource "google_compute_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
 
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
 
-  base_instance_name = "igm-no-tp"
-  zone               = "us-central1-c"
-  target_size        = 2
-}
-`, template, target, igm1, igm2)
+		target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+		base_instance_name = "igm-basic"
+		zone = "us-central1-c"
+		target_size = 2
+	}
+
+	resource "google_compute_instance_group_manager" "igm-no-tp" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
+
+		base_instance_name = "igm-no-tp"
+		zone = "us-central1-c"
+		target_size = 2
+	}
+	`, template, target, igm1, igm2)
 }
 
 func testAccInstanceGroupManager_targetSizeZero(template, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
+		network_interface {
+			network = "default"
+		}
 
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-}
-`, template, igm)
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
+
+		base_instance_name = "igm-basic"
+		zone = "us-central1-c"
+	}
+	`, template, igm)
 }
 
 func testAccInstanceGroupManager_update(template, target, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-update" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-update" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-update.self_link
-  }
-
-  target_pools       = [google_compute_target_pool.igm-update.self_link]
-  base_instance_name = "igm-update"
-  zone               = "us-central1-c"
-  target_size        = 2
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, template, target, igm)
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_target_pool" "igm-update" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-update.self_link}"
+		}
+
+		target_pools = ["${google_compute_target_pool.igm-update.self_link}"]
+		base_instance_name = "igm-update"
+		zone = "us-central1-c"
+		target_size = 2
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+	}`, template, target, igm)
 }
 
 // Change IGM's instance template and target size
 func testAccInstanceGroupManager_update2(template1, target1, target2, template2, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-update" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-update" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_target_pool" "igm-update2" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		network_interface {
+			network = "default"
+		}
 
-resource "google_compute_instance_template" "igm-update2" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
 
-resource "google_compute_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-update2.self_link
-  }
-
-  target_pools = [
-    google_compute_target_pool.igm-update.self_link,
-    google_compute_target_pool.igm-update2.self_link,
-  ]
-  base_instance_name = "igm-update"
-  zone               = "us-central1-c"
-  target_size        = 3
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-  named_port {
-    name = "customhttps"
-    port = 8443
-  }
-}
-`, template1, target1, target2, template2, igm)
+	resource "google_compute_target_pool" "igm-update" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_target_pool" "igm-update2" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_instance_template" "igm-update2" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
+
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
+
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-update2.self_link}"
+		}
+
+		target_pools = [
+			"${google_compute_target_pool.igm-update.self_link}",
+			"${google_compute_target_pool.igm-update2.self_link}",
+		]
+		base_instance_name = "igm-update"
+		zone = "us-central1-c"
+		target_size = 3
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+		named_port {
+			name = "customhttps"
+			port = 8443
+		}
+	}`, template1, target1, target2, template2, igm)
 }
 
 func testAccInstanceGroupManager_updateLifecycle(tag, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["%s"]
+	resource "google_compute_instance_template" "igm-update" {
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["%s"]
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  network_interface {
-    network = "default"
-  }
+		network_interface {
+			network = "default"
+		}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
 
-  lifecycle {
-    create_before_destroy = true
-  }
-}
+		lifecycle {
+			create_before_destroy = true
+		}
+	}
 
-resource "google_compute_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-update.self_link
-  }
-
-  base_instance_name = "igm-update"
-  zone               = "us-central1-c"
-  target_size        = 2
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, tag, igm)
+	resource "google_compute_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-update.self_link}"
+		}
+
+		base_instance_name = "igm-update"
+		zone = "us-central1-c"
+		target_size = 2
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+	}`, tag, igm)
 }
 
 func testAccInstanceGroupManager_rollingUpdatePolicy(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["terraform-testing"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-  }
-  base_instance_name = "igm-rolling-update-policy"
-  zone               = "us-central1-c"
-  target_size        = 3
-  update_policy {
-    type                    = "PROACTIVE"
-    minimal_action          = "REPLACE"
-    max_surge_percent       = 50
-    max_unavailable_percent = 50
-    min_ready_sec           = 20
-  }
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		name = "prod"
+		instance_template = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	zone = "us-central1-c"
+	target_size = 3
+	update_policy {
+		type = "PROACTIVE"
+		minimal_action = "REPLACE"
+		max_surge_percent = 50
+		max_unavailable_percent = 50
+		min_ready_sec = 20
+	}
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccInstanceGroupManager_rollingUpdatePolicy2(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["terraform-testing"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    name              = "prod2"
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-  }
-  base_instance_name = "igm-rolling-update-policy"
-  zone               = "us-central1-c"
-  target_size        = 3
-  update_policy {
-    type                  = "PROACTIVE"
-    minimal_action        = "REPLACE"
-    max_surge_fixed       = 2
-    max_unavailable_fixed = 2
-    min_ready_sec         = 20
-  }
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		name = "prod2"
+		instance_template = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	zone = "us-central1-c"
+	target_size = 3
+	update_policy {
+		type = "PROACTIVE"
+		minimal_action = "REPLACE"
+		max_surge_fixed = 2
+		max_unavailable_fixed = 2
+		min_ready_sec = 20
+	}
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccInstanceGroupManager_rollingUpdatePolicy3(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
-
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["terraform-testing"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+	lifecycle {
+		create_before_destroy = true
+	}
 }
-
 resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    name              = "prod2"
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-  }
-  base_instance_name = "igm-rolling-update-policy"
-  zone               = "us-central1-c"
-  target_size        = 3
-  update_policy {
-    type                  = "PROACTIVE"
-    minimal_action        = "REPLACE"
-    max_surge_fixed       = 0
-    max_unavailable_fixed = 2
-    min_ready_sec         = 20
-  }
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		name = "prod2"
+		instance_template = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	zone = "us-central1-c"
+	target_size = 3
+	update_policy {
+		type = "PROACTIVE"
+		minimal_action = "REPLACE"
+		max_surge_fixed = 0
+		max_unavailable_fixed = 2
+		min_ready_sec = 20
+	}
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccInstanceGroupManager_rollingUpdatePolicy4(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
-
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["terraform-testing"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+	lifecycle {
+		create_before_destroy = true
+	}
 }
-
 resource "google_compute_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    name              = "prod2"
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-  }
-  base_instance_name = "igm-rolling-update-policy"
-  zone               = "us-central1-c"
-  target_size        = 3
-  update_policy {
-    type                  = "PROACTIVE"
-    minimal_action        = "REPLACE"
-    max_surge_fixed       = 2
-    max_unavailable_fixed = 0
-    min_ready_sec         = 20
-  }
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		name = "prod2"
+		instance_template = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	zone = "us-central1-c"
+	target_size = 3
+	update_policy {
+		type = "PROACTIVE"
+		minimal_action = "REPLACE"
+		max_surge_fixed = 2
+		max_unavailable_fixed = 0
+		min_ready_sec = 20
+	}
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccInstanceGroupManager_separateRegions(igm1, igm2 string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "prod"
-  }
+		network_interface {
+			network = "default"
+		}
 
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-  target_size        = 2
-}
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
 
-resource "google_compute_instance_group_manager" "igm-basic-2" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+	resource "google_compute_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
 
-  version {
-    name              = "prod"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
+		version {
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+			name = "prod"
+		}
 
-  base_instance_name = "igm-basic-2"
-  zone               = "us-west1-b"
-  target_size        = 2
-}
-`, igm1, igm2)
+		base_instance_name = "igm-basic"
+		zone = "us-central1-c"
+		target_size = 2
+	}
+
+	resource "google_compute_instance_group_manager" "igm-basic-2" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "prod"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
+
+		base_instance_name = "igm-basic-2"
+		zone = "us-west1-b"
+		target_size = 2
+	}
+	`, igm1, igm2)
 }
 
 func testAccInstanceGroupManager_autoHealingPolicies(template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
 
 resource "google_compute_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "prod"
-  }
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-  target_size        = 2
-  auto_healing_policies {
-    health_check      = google_compute_http_health_check.zero.self_link
-    initial_delay_sec = "10"
-  }
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		name = "prod"
+	}
+	target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+	base_instance_name = "igm-basic"
+	zone = "us-central1-c"
+	target_size = 2
+	auto_healing_policies {
+		health_check = "${google_compute_http_health_check.zero.self_link}"
+		initial_delay_sec = "10"
+	}
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
-`, template, target, igm, hck)
+	`, template, target, igm, hck)
 }
 
 func testAccInstanceGroupManager_autoHealingPoliciesRemoved(template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
-
 resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
 
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+}
 resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
-
 resource "google_compute_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "prod"
-  }
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-  target_size        = 2
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		name = "prod"
+	}
+	target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+	base_instance_name = "igm-basic"
+	zone = "us-central1-c"
+	target_size = 2
 }
-
 resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
-`, template, target, igm, hck)
+	`, template, target, igm, hck)
 }
 
 func testAccInstanceGroupManager_versions(primaryTemplate string, canaryTemplate string, igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-primary" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_instance_template" "igm-canary" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_instance_group_manager" "igm-basic" {
-  description        = "Terraform test instance group manager"
-  name               = "%s"
-  base_instance_name = "igm-basic"
-  zone               = "us-central1-c"
-  target_size        = 2
-
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-primary.self_link
-  }
-
-  version {
-    name              = "canary"
-    instance_template = google_compute_instance_template.igm-canary.self_link
-    target_size {
-      fixed = 1
-    }
-  }
+	description = "Terraform test instance group manager"
+	name = "%s"
+	base_instance_name = "igm-basic"
+	zone = "us-central1-c"
+	target_size = 2
+
+	version {
+		name = "primary"
+		instance_template = "${google_compute_instance_template.igm-primary.self_link}"
+	}
+
+	version {
+		name = "canary"
+		instance_template = "${google_compute_instance_template.igm-canary.self_link}"
+		target_size {
+			fixed = 1
+		}
+	}
 }
-`, primaryTemplate, canaryTemplate, igm)
+	`, primaryTemplate, canaryTemplate, igm)
 }
diff --git a/google/resource_compute_instance_group_test.go b/google/resource_compute_instance_group_test.go
index 42bd99ae72c..a7f6c2edf41 100644
--- a/google/resource_compute_instance_group_test.go
+++ b/google/resource_compute_instance_group_test.go
@@ -317,307 +317,302 @@ func testAccComputeInstanceGroup_hasCorrectNetwork(nInstanceGroup string, nNetwo
 
 func testAccComputeInstanceGroup_basic(zone, instance string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance" "ig_instance" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
+	resource "google_compute_instance" "ig_instance" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
 
-resource "google_compute_instance_group" "basic" {
-  description = "Terraform test instance group"
-  name        = "%s"
-  zone        = "%s"
-  instances   = [google_compute_instance.ig_instance.self_link]
-  named_port {
-    name = "http"
-    port = "8080"
-  }
-  named_port {
-    name = "https"
-    port = "8443"
-  }
-}
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
 
-resource "google_compute_instance_group" "empty" {
-  description = "Terraform test instance group empty"
-  name        = "%s-empty"
-  zone        = "%s"
-  named_port {
-    name = "http"
-    port = "8080"
-  }
-  named_port {
-    name = "https"
-    port = "8443"
-  }
-}
-`, instance, instance, zone, instance, zone)
+		network_interface {
+			network = "default"
+		}
+	}
+
+	resource "google_compute_instance_group" "basic" {
+		description = "Terraform test instance group"
+		name = "%s"
+		zone = "%s"
+		instances = [ "${google_compute_instance.ig_instance.self_link}" ]
+		named_port {
+			name = "http"
+			port = "8080"
+		}
+		named_port {
+			name = "https"
+			port = "8443"
+		}
+	}
+
+	resource "google_compute_instance_group" "empty" {
+		description = "Terraform test instance group empty"
+		name = "%s-empty"
+		zone = "%s"
+		named_port {
+			name = "http"
+			port = "8080"
+		}
+		named_port {
+			name = "https"
+			port = "8443"
+		}
+	}`, instance, instance, zone, instance, zone)
 }
 
 func testAccComputeInstanceGroup_rename(instance, instanceGroup, backend, health string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "ig_instance" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	zone = "us-central1-c"
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_instance_group" "basic" {
-  name      = "%s"
-  zone      = "us-central1-c"
-  instances = [google_compute_instance.ig_instance.self_link]
-  named_port {
-    name = "http"
-    port = "8080"
-  }
-
-  named_port {
-    name = "https"
-    port = "8443"
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	name = "%s"
+	zone = "us-central1-c"
+	instances = [ "${google_compute_instance.ig_instance.self_link}" ]
+	named_port {
+		name = "http"
+		port = "8080"
+	}
+
+	named_port {
+		name = "https"
+		port = "8443"
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_backend_service" "default_backend" {
-  name      = "%s"
-  port_name = "https"
-  protocol  = "HTTPS"
+	name      = "%s"
+	port_name = "https"
+	protocol  = "HTTPS"
 
-  backend {
-    group = google_compute_instance_group.basic.self_link
-  }
+	backend {
+		group = "${google_compute_instance_group.basic.self_link}"
+	}
 
-  health_checks = [
-    google_compute_https_health_check.healthcheck.self_link,
-  ]
+	health_checks = [
+		"${google_compute_https_health_check.healthcheck.self_link}",
+	]
 }
 
 resource "google_compute_https_health_check" "healthcheck" {
-  name         = "%s"
-  request_path = "/health_check"
+	name         = "%s"
+	request_path = "/health_check"
 }
 `, instance, instanceGroup, backend, health)
 }
 
 func testAccComputeInstanceGroup_update(instance string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family    = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance" "ig_instance" {
-  name           = "%s-${count.index}"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-  count          = 2
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
+	resource "google_compute_instance" "ig_instance" {
+		name = "%s-${count.index}"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
+		count = 2
 
-resource "google_compute_instance_group" "update" {
-  description = "Terraform test instance group"
-  name        = "%s"
-  zone        = "us-central1-c"
-  instances   = google_compute_instance.ig_instance.*.self_link
-  named_port {
-    name = "http"
-    port = "8080"
-  }
-  named_port {
-    name = "https"
-    port = "8443"
-  }
-}
-`, instance, instance)
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
+
+		network_interface {
+			network = "default"
+		}
+	}
+
+	resource "google_compute_instance_group" "update" {
+		description = "Terraform test instance group"
+		name = "%s"
+		zone = "us-central1-c"
+		instances = google_compute_instance.ig_instance.*.self_link
+		named_port {
+			name = "http"
+			port = "8080"
+		}
+		named_port {
+			name = "https"
+			port = "8443"
+		}
+	}`, instance, instance)
 }
 
 // Change IGM's instance template and target size
 func testAccComputeInstanceGroup_update2(instance string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance" "ig_instance" {
-  name           = "%s-${count.index}"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-  count          = 1
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
+	resource "google_compute_instance" "ig_instance" {
+		name = "%s-${count.index}"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
+		count = 1
 
-resource "google_compute_instance_group" "update" {
-  description = "Terraform test instance group"
-  name        = "%s"
-  zone        = "us-central1-c"
-  instances   = google_compute_instance.ig_instance.*.self_link
-
-  named_port {
-    name = "http"
-    port = "8081"
-  }
-  named_port {
-    name = "test"
-    port = "8444"
-  }
-}
-`, instance, instance)
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
+
+		network_interface {
+			network = "default"
+		}
+	}
+
+	resource "google_compute_instance_group" "update" {
+		description = "Terraform test instance group"
+		name = "%s"
+		zone = "us-central1-c"
+		instances = google_compute_instance.ig_instance.*.self_link
+
+		named_port {
+			name = "http"
+			port = "8081"
+		}
+		named_port {
+			name = "test"
+			port = "8444"
+		}
+	}`, instance, instance)
 }
 
 func testAccComputeInstanceGroup_outOfOrderInstances(instance string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance" "ig_instance" {
-  name           = "%s-1"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
+	resource "google_compute_instance" "ig_instance" {
+		name = "%s-1"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
 
-resource "google_compute_instance" "ig_instance_2" {
-  name           = "%s-2"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
 
-resource "google_compute_instance_group" "group" {
-  description = "Terraform test instance group"
-  name        = "%s"
-  zone        = "us-central1-c"
-  instances   = [google_compute_instance.ig_instance_2.self_link, google_compute_instance.ig_instance.self_link]
-  named_port {
-    name = "http"
-    port = "8080"
-  }
-  named_port {
-    name = "https"
-    port = "8443"
-  }
-}
-`, instance, instance, instance)
+		network_interface {
+			network = "default"
+		}
+	}
+
+	resource "google_compute_instance" "ig_instance_2" {
+		name = "%s-2"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
+
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
+
+		network_interface {
+			network = "default"
+		}
+	}
+
+	resource "google_compute_instance_group" "group" {
+		description = "Terraform test instance group"
+		name = "%s"
+		zone = "us-central1-c"
+		instances = [ "${google_compute_instance.ig_instance_2.self_link}", "${google_compute_instance.ig_instance.self_link}" ]
+		named_port {
+			name = "http"
+			port = "8080"
+		}
+		named_port {
+			name = "https"
+			port = "8443"
+		}
+	}`, instance, instance, instance)
 }
 
 func testAccComputeInstanceGroup_network(instance string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_network" "ig_network" {
-  name                    = "%[1]s"
-  auto_create_subnetworks = true
-}
+	resource "google_compute_network" "ig_network" {
+		name = "%[1]s"
+		auto_create_subnetworks = true
+	}
 
-resource "google_compute_instance" "ig_instance" {
-  name           = "%[1]s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  zone           = "us-central1-c"
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
-
-  network_interface {
-    network = google_compute_network.ig_network.name
-  }
-}
+	resource "google_compute_instance" "ig_instance" {
+		name = "%[1]s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		zone = "us-central1-c"
 
-resource "google_compute_instance_group" "with_instance" {
-  description = "Terraform test instance group"
-  name        = "%[1]s-with-instance"
-  zone        = "us-central1-c"
-  instances   = [google_compute_instance.ig_instance.self_link]
-}
+		boot_disk {
+			initialize_params {
+				image = "${data.google_compute_image.my_image.self_link}"
+			}
+		}
 
-resource "google_compute_instance_group" "without_instance" {
-  description = "Terraform test instance group"
-  name        = "%[1]s-without-instance"
-  zone        = "us-central1-c"
-  network     = google_compute_network.ig_network.self_link
-}
-`, instance)
+		network_interface {
+			network = "${google_compute_network.ig_network.name}"
+		}
+	}
+
+	resource "google_compute_instance_group" "with_instance" {
+		description = "Terraform test instance group"
+		name = "%[1]s-with-instance"
+		zone = "us-central1-c"
+		instances = [ "${google_compute_instance.ig_instance.self_link}" ]
+	}
+
+	resource "google_compute_instance_group" "without_instance" {
+		description = "Terraform test instance group"
+		name = "%[1]s-without-instance"
+		zone = "us-central1-c"
+		network = "${google_compute_network.ig_network.self_link}"
+	}`, instance)
 }
diff --git a/google/resource_compute_instance_template_test.go b/google/resource_compute_instance_template_test.go
index a2588297182..43695f5cf11 100644
--- a/google/resource_compute_instance_template_test.go
+++ b/google/resource_compute_instance_template_test.go
@@ -1158,724 +1158,703 @@ func testAccCheckComputeInstanceTemplateLacksShieldedVmConfig(instanceTemplate *
 func testAccComputeInstanceTemplate_basic() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    preemptible       = false
-    automatic_restart = true
-  }
+	scheduling {
+		preemptible = false
+		automatic_restart = true
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 
-  labels = {
-    my_label = "foobar"
-  }
-}
-`, acctest.RandString(10))
+    labels = {
+        my_label = "foobar"
+    }
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_imageShorthand() string {
 	return fmt.Sprintf(`
 resource "google_compute_image" "foobar" {
-  name        = "test-%s"
-  description = "description-test"
-  family      = "family-test"
-  raw_disk {
-    source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
-  }
-  labels = {
-    my-label    = "my-label-value"
-    empty-label = ""
-  }
-  timeouts {
-    create = "5m"
-  }
+	name = "test-%s"
+	description = "description-test"
+	family = "family-test"
+	raw_disk {
+	  source = "https://storage.googleapis.com/bosh-cpi-artifacts/bosh-stemcell-3262.4-google-kvm-ubuntu-trusty-go_agent-raw.tar.gz"
+	}
+	labels = {
+		my-label = "my-label-value"
+		empty-label = ""
+	}
+	timeouts {
+		create = "5m"
+	}
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = google_compute_image.foobar.name
-    auto_delete  = true
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${google_compute_image.foobar.name}"
+		auto_delete = true
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    preemptible       = false
-    automatic_restart = true
-  }
+	scheduling {
+		preemptible = false
+		automatic_restart = true
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 
-  labels = {
-    my_label = "foobar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+    labels = {
+        my_label = "foobar"
+    }
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_preemptible() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    preemptible       = true
-    automatic_restart = false
-  }
+	scheduling {
+		preemptible = true
+		automatic_restart = false
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
-`, acctest.RandString(10))
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_ip() string {
 	return fmt.Sprintf(`
 resource "google_compute_address" "foo" {
-  name = "instancet-test-%s"
+	name = "instancet-test-%s"
 }
 
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-  tags         = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-  }
-
-  network_interface {
-    network = "default"
-    access_config {
-      nat_ip = google_compute_address.foo.address
-    }
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	tags = ["foo", "bar"]
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+	}
+
+	network_interface {
+		network = "default"
+		access_config {
+			nat_ip = "${google_compute_address.foo.address}"
+		}
+	}
+
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_networkTier() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-  }
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-      network_tier = "STANDARD"
-    }
-  }
-}
-`, acctest.RandString(10))
+	network_interface {
+		network = "default"
+		access_config {
+			network_tier = "STANDARD"
+		}
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_networkIP(networkIP string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-  tags         = ["foo", "bar"]
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	tags = ["foo", "bar"]
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-  }
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+	}
 
-  network_interface {
-    network    = "default"
-    network_ip = "%s"
-  }
+	network_interface {
+		network    = "default"
+		network_ip = "%s"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), networkIP)
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), networkIP)
 }
 
 func testAccComputeInstanceTemplate_networkIPAddress(ipAddress string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-  tags         = ["foo", "bar"]
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	tags = ["foo", "bar"]
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-  }
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+	}
 
-  network_interface {
-    network    = "default"
-    network_ip = "%s"
-  }
+	network_interface {
+		network    = "default"
+		network_ip    = "%s"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), ipAddress)
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), ipAddress)
 }
 
 func testAccComputeInstanceTemplate_disks() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "instancet-test-%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "instancet-test-%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-    labels = {
-      foo = "bar"
-    }
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+		labels = {
+			foo = "bar"
+		}
+	}
 
-  disk {
-    source      = google_compute_disk.foobar.name
-    auto_delete = false
-    boot        = false
-  }
+	disk {
+		source = "${google_compute_disk.foobar.name}"
+		auto_delete = false
+		boot = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_disksInvalid() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "instancet-test-%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "instancet-test-%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
 
-  disk {
-    source       = google_compute_disk.foobar.name
-    disk_size_gb = 50
-    auto_delete  = false
-    boot         = false
-  }
+	disk {
+		source = "${google_compute_disk.foobar.name}"
+		disk_size_gb = 50
+		auto_delete = false
+		boot = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_regionDisks() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_region_disk" "foobar" {
-  name          = "instancet-test-%s"
-  size          = 10
-  type          = "pd-ssd"
-  region        = "us-central1"
-  replica_zones = ["us-central1-a", "us-central1-f"]
+	name = "instancet-test-%s"
+	size = 10
+	type = "pd-ssd"
+	region = "us-central1"
+	replica_zones = ["us-central1-a", "us-central1-f"]
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 100
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 100
+		boot = true
+	}
 
-  disk {
-    source      = google_compute_region_disk.foobar.name
-    auto_delete = false
-    boot        = false
-  }
+	disk {
+		source = "${google_compute_region_disk.foobar.name}"
+		auto_delete = false
+		boot = false
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_subnet_auto(network string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_network" "auto-network" {
-  name                    = "%s"
-  auto_create_subnetworks = true
-}
+	resource "google_compute_network" "auto-network" {
+		name = "%s"
+		auto_create_subnetworks = true
+	}
 
-resource "google_compute_instance_template" "foobar" {
-  name         = "instance-tpl-%s"
-  machine_type = "n1-standard-1"
+	resource "google_compute_instance_template" "foobar" {
+		name = "instance-tpl-%s"
+		machine_type = "n1-standard-1"
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			disk_size_gb = 10
+			boot = true
+		}
 
-  network_interface {
-    network = google_compute_network.auto-network.name
-  }
+		network_interface {
+			network = "${google_compute_network.auto-network.name}"
+		}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, network, acctest.RandString(10))
+		metadata = {
+			foo = "bar"
+		}
+	}`, network, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_subnet_custom() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "network" {
-  name                    = "network-%s"
-  auto_create_subnetworks = false
+	name = "network-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "subnetwork" {
-  name          = "subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/24"
-  region        = "us-central1"
-  network       = google_compute_network.network.self_link
+	name = "subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/24"
+	region = "us-central1"
+	network = "${google_compute_network.network.self_link}"
 }
 
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-  region       = "us-central1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+	region = "us-central1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.subnetwork.name
-  }
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.subnetwork.name}"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
+	metadata = {
+		foo = "bar"
+	}
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_subnet_xpn(org, billingId, projectName string) string {
 	return fmt.Sprintf(`
-resource "google_project" "host_project" {
-  name            = "Test Project XPN Host"
-  project_id      = "%s-host"
-  org_id          = "%s"
-  billing_account = "%s"
-}
+	resource "google_project" "host_project" {
+		name = "Test Project XPN Host"
+		project_id = "%s-host"
+		org_id = "%s"
+		billing_account = "%s"
+	}
 
-resource "google_project_service" "host_project" {
-  project = google_project.host_project.project_id
-  service = "compute.googleapis.com"
-}
+	resource "google_project_service" "host_project" {
+		project = "${google_project.host_project.project_id}"
+		service = "compute.googleapis.com"
+	}
 
-resource "google_compute_shared_vpc_host_project" "host_project" {
-  project = google_project_service.host_project.project
-}
+	resource "google_compute_shared_vpc_host_project" "host_project" {
+		project = "${google_project_service.host_project.project}"
+	}
 
-resource "google_project" "service_project" {
-  name            = "Test Project XPN Service"
-  project_id      = "%s-service"
-  org_id          = "%s"
-  billing_account = "%s"
-}
+	resource "google_project" "service_project" {
+		name = "Test Project XPN Service"
+		project_id = "%s-service"
+		org_id = "%s"
+		billing_account = "%s"
+	}
 
-resource "google_project_service" "service_project" {
-  project = google_project.service_project.project_id
-  service = "compute.googleapis.com"
-}
+	resource "google_project_service" "service_project" {
+		project = "${google_project.service_project.project_id}"
+		service = "compute.googleapis.com"
+	}
 
-resource "google_compute_shared_vpc_service_project" "service_project" {
-  host_project    = google_compute_shared_vpc_host_project.host_project.project
-  service_project = google_project_service.service_project.project
-}
+	resource "google_compute_shared_vpc_service_project" "service_project" {
+		host_project = "${google_compute_shared_vpc_host_project.host_project.project}"
+		service_project = "${google_project_service.service_project.project}"
+	}
 
-resource "google_compute_network" "network" {
-  name                    = "network-%s"
-  auto_create_subnetworks = false
-  project                 = google_compute_shared_vpc_host_project.host_project.project
-}
+	resource "google_compute_network" "network" {
+		name = "network-%s"
+		auto_create_subnetworks = false
+		project = "${google_compute_shared_vpc_host_project.host_project.project}"
+	}
 
-resource "google_compute_subnetwork" "subnetwork" {
-  name          = "subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/24"
-  region        = "us-central1"
-  network       = google_compute_network.network.self_link
-  project       = google_compute_shared_vpc_host_project.host_project.project
-}
+	resource "google_compute_subnetwork" "subnetwork" {
+		name = "subnetwork-%s"
+		ip_cidr_range = "10.0.0.0/24"
+		region = "us-central1"
+		network = "${google_compute_network.network.self_link}"
+		project = "${google_compute_shared_vpc_host_project.host_project.project}"
+	}
 
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-  region       = "us-central1"
+	resource "google_compute_instance_template" "foobar" {
+		name = "instance-test-%s"
+		machine_type = "n1-standard-1"
+		region = "us-central1"
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			disk_size_gb = 10
+			boot = true
+		}
 
-  network_interface {
-    subnetwork         = google_compute_subnetwork.subnetwork.name
-    subnetwork_project = google_compute_subnetwork.subnetwork.project
-  }
+		network_interface {
+			subnetwork = "${google_compute_subnetwork.subnetwork.name}"
+			subnetwork_project = "${google_compute_subnetwork.subnetwork.project}"
+		}
 
-  metadata = {
-    foo = "bar"
-  }
-  project = google_compute_shared_vpc_service_project.service_project.service_project
-}
-`, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
+		metadata = {
+			foo = "bar"
+		}
+		project = "${google_compute_shared_vpc_service_project.service_project.service_project}"
+	}`, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_startup_script() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface{
+		network = "default"
+	}
 
-  metadata_startup_script = "echo 'Hello'"
-}
-`, acctest.RandString(10))
+	metadata_startup_script = "echo 'Hello'"
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_primaryAliasIpRange(i string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
-
-  metadata = {
-    foo = "bar"
-  }
-
-  network_interface {
-    network = "default"
-    alias_ip_range {
-      ip_cidr_range = "/24"
-    }
-  }
-}
-`, i)
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
+
+	metadata = {
+		foo = "bar"
+	}
+
+	network_interface{
+		network = "default"
+		alias_ip_range {
+			ip_cidr_range = "/24"
+		}
+	}
+}`, i)
 }
 
 func testAccComputeInstanceTemplate_secondaryAliasIpRange(i string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "inst-test-network" {
-  name = "inst-test-network-%s"
+	name = "inst-test-network-%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "inst-test-subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-east1"
-  network       = google_compute_network.inst-test-network.self_link
-  secondary_ip_range {
-    range_name    = "inst-test-secondary"
-    ip_cidr_range = "172.16.0.0/20"
-  }
+	name          = "inst-test-subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-east1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
+	secondary_ip_range {
+		range_name = "inst-test-secondary"
+		ip_cidr_range = "172.16.0.0/20"
+	}
 }
-
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
-
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
-
-  metadata = {
-    foo = "bar"
-  }
-
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.self_link
-
-    // Note that unlike compute instances, instance templates seem to be
-    // only able to specify the netmask here. Trying a full CIDR string
-    // results in:
-    // Invalid value for field 'resource.properties.networkInterfaces[0].aliasIpRanges[0].ipCidrRange':
-    // '172.16.0.0/24'. Alias IP CIDR range must be a valid netmask starting with '/' (e.g. '/24')
-    alias_ip_range {
-      subnetwork_range_name = google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range[0].range_name
-      ip_cidr_range         = "/24"
-    }
-  }
-}
-`, i, i, i)
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
+
+	metadata = {
+		foo = "bar"
+	}
+
+  	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.self_link}"
+
+		// Note that unlike compute instances, instance templates seem to be
+		// only able to specify the netmask here. Trying a full CIDR string
+		// results in:
+		// Invalid value for field 'resource.properties.networkInterfaces[0].aliasIpRanges[0].ipCidrRange':
+		// '172.16.0.0/24'. Alias IP CIDR range must be a valid netmask starting with '/' (e.g. '/24')
+		alias_ip_range {
+			subnetwork_range_name = "${google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range.0.range_name}"
+			ip_cidr_range = "/24"
+		}
+	}
+}`, i, i, i)
 }
 
 func testAccComputeInstanceTemplate_guestAccelerator(i string, count uint8) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    # Instances with guest accelerators do not support live migration.
-    on_host_maintenance = "TERMINATE"
-  }
+	scheduling {
+		# Instances with guest accelerators do not support live migration.
+		on_host_maintenance = "TERMINATE"
+	}
 
-  guest_accelerator {
-    count = %d
-    type  = "nvidia-tesla-k80"
-  }
-}
-`, i, count)
+	guest_accelerator {
+		count = %d
+		type = "nvidia-tesla-k80"
+	}
+}`, i, count)
 }
 
 func testAccComputeInstanceTemplate_minCpuPlatform(i string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instance-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    disk_size_gb = 10
-    boot         = true
-  }
+	name = "instance-test-%s"
+	machine_type = "n1-standard-1"
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		disk_size_gb = 10
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    # Instances with guest accelerators do not support live migration.
-    on_host_maintenance = "TERMINATE"
-  }
+	scheduling {
+		# Instances with guest accelerators do not support live migration.
+		on_host_maintenance = "TERMINATE"
+	}
 
-  min_cpu_platform = "%s"
-}
-`, i, DEFAULT_MIN_CPU_TEST_VALUE)
+	min_cpu_platform = "%s"
+}`, i, DEFAULT_MIN_CPU_TEST_VALUE)
 }
 
 func testAccComputeInstanceTemplate_encryptionKMS(kmsLink string) string {
@@ -1886,123 +1865,118 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    disk_encryption_key {
-      kms_key_self_link = "%s"
-    }
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		disk_encryption_key {
+			kms_key_self_link = "%s"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 
-  labels = {
-    my_label = "foobar"
-  }
-}
-`, acctest.RandString(10), kmsLink)
+    labels = {
+        my_label = "foobar"
+    }
+}`, acctest.RandString(10), kmsLink)
 }
 
 func testAccComputeInstanceTemplate_soleTenantInstanceTemplate() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name         = "instancet-test-%s"
-  machine_type = "n1-standard-1"
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  scheduling {
-    preemptible       = false
-    automatic_restart = true
-    node_affinities {
-      key      = "tfacc"
-      operator = "IN"
-      values   = ["testinstancetemplate"]
-    }
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
-`, acctest.RandString(10))
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	scheduling {
+		preemptible = false
+		automatic_restart = true
+		node_affinities {
+      		key = "tfacc"
+      		operator = "IN"
+      		values = ["testinstancetemplate"]
+        }
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_shieldedVmConfig(enableSecureBoot bool, enableVtpm bool, enableIntegrityMonitoring bool) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "centos-7"
-  project = "gce-uefi-images"
+	family  = "centos-7"
+	project = "gce-uefi-images"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  shielded_instance_config {
-    enable_secure_boot          = %t
-    enable_vtpm                 = %t
-    enable_integrity_monitoring = %t
-  }
-}
-`, acctest.RandString(10), enableSecureBoot, enableVtpm, enableIntegrityMonitoring)
+	shielded_instance_config {
+		enable_secure_boot          = %t
+		enable_vtpm                 = %t
+		enable_integrity_monitoring = %t
+	}
+}`, acctest.RandString(10), enableSecureBoot, enableVtpm, enableIntegrityMonitoring)
 }
 
 func testAccComputeInstanceTemplate_enableDisplay() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "centos-7"
-  project = "gce-uefi-images"
+	family  = "centos-7"
+	project = "gce-uefi-images"
 }
-
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-  enable_display = true
-}
-`, acctest.RandString(10))
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+	enable_display = true
+}`, acctest.RandString(10))
 }
 
 func testAccComputeInstanceTemplate_invalidDiskType() string {
@@ -2014,28 +1988,27 @@ func testAccComputeInstanceTemplate_invalidDiskType() string {
 # 	project = "gce-uefi-images"
 # }
 resource "google_compute_instance_template" "foobar" {
-  name           = "instancet-test-%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  disk {
-    source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
-    auto_delete  = true
-    boot         = true
-  }
-  disk {
-    auto_delete  = true
-    disk_size_gb = 375
-    type         = "SCRATCH"
-    disk_type    = "local-ssd"
-  }
-  disk {
-    source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
-    auto_delete  = true
-    type         = "SCRATCH"
-  }
-  network_interface {
-    network = "default"
-  }
-}
-`, acctest.RandString(10))
+	name = "instancet-test-%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	disk {
+		source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+		auto_delete = true
+		boot = true
+	}
+	disk {
+		auto_delete = true
+		disk_size_gb = 375
+		type = "SCRATCH"
+		disk_type = "local-ssd"
+	}
+	disk {
+		source_image = "https://www.googleapis.com/compute/v1/projects/gce-uefi-images/global/images/centos-7-v20190729"
+		auto_delete = true
+		type = "SCRATCH"
+	}
+	network_interface {
+		network = "default"
+	}
+}`, acctest.RandString(10))
 }
diff --git a/google/resource_compute_instance_test.go b/google/resource_compute_instance_test.go
index 28f445f3c01..b0c36bee771 100644
--- a/google/resource_compute_instance_test.go
+++ b/google/resource_compute_instance_test.go
@@ -1812,39 +1812,38 @@ func testAccCheckComputeInstanceLacksShieldedVmConfig(instance *computeBeta.Inst
 func testAccComputeInstance_basic(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["foo", "bar"]
+	//deletion_protection = false is implicit in this config due to default value
 
-  //deletion_protection = false is implicit in this config due to default value
-
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo            = "bar"
-    baz            = "qux"
-    startup-script = "echo Hello"
-  }
+	metadata = {
+		foo = "bar"
+		baz = "qux"
+		startup-script = "echo Hello"
+	}
 
-  labels = {
-    my_key       = "my_value"
-    my_other_key = "my_other_value"
-  }
+	labels = {
+		my_key       = "my_value"
+		my_other_key = "my_other_value"
+	}
 }
 `, instance)
 }
@@ -1852,30 +1851,30 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic2(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, instance)
 }
@@ -1883,30 +1882,30 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic3(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, instance)
 }
@@ -1914,30 +1913,31 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic4(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+
+	metadata = {
+		foo = "bar"
+	}
 }
 `, instance)
 }
@@ -1945,30 +1945,30 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic5(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, instance)
 }
@@ -1976,27 +1976,27 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic_deletionProtectionFalse(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name                = "%s"
-  machine_type        = "n1-standard-1"
-  zone                = "us-central1-a"
-  can_ip_forward      = false
-  tags                = ["foo", "bar"]
-  deletion_protection = false
+	name                 = "%s"
+	machine_type         = "n1-standard-1"
+	zone                 = "us-central1-a"
+	can_ip_forward       = false
+	tags                 = ["foo", "bar"]
+	deletion_protection  = false
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, instance)
 }
@@ -2004,27 +2004,27 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_basic_deletionProtectionTrue(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name                = "%s"
-  machine_type        = "n1-standard-1"
-  zone                = "us-central1-a"
-  can_ip_forward      = false
-  tags                = ["foo", "bar"]
-  deletion_protection = true
+	name                 = "%s"
+	machine_type         = "n1-standard-1"
+	zone                 = "us-central1-a"
+	can_ip_forward       = false
+	tags                 = ["foo", "bar"]
+	deletion_protection  = true
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, instance)
 }
@@ -2034,31 +2034,30 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_forceNewAndChangeMetadata(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-b"
-  tags         = ["baz"]
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-b"
+	tags         = ["baz"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-    }
-  }
+	network_interface {
+		network = "default"
+		access_config { }
+	}
 
-  metadata = {
-    qux = "true"
-  }
+	metadata = {
+		qux = "true"
+	}
 }
 `, instance)
 }
@@ -2067,37 +2066,36 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_update(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
-  tags           = ["baz"]
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
+	tags           = ["baz"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-    }
-  }
+	network_interface {
+		network = "default"
+		access_config { }
+	}
 
-  metadata = {
-    bar            = "baz"
-    startup-script = "echo Hello"
-  }
+	metadata = {
+		bar            = "baz"
+		startup-script = "echo Hello"
+	}
 
-  labels = {
-    only_me = "nothing_else"
-  }
+	labels = {
+		only_me = "nothing_else"
+	}
 }
 `, instance)
 }
@@ -2105,36 +2103,36 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_ip(ip, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_address" "foo" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
-  tags         = ["foo", "bar"]
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
+	tags         = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-      nat_ip = google_compute_address.foo.address
-    }
-  }
+	network_interface {
+		network = "default"
+		access_config {
+			nat_ip = "${google_compute_address.foo.address}"
+		}
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, ip, instance)
 }
@@ -2142,32 +2140,32 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_PTRRecord(record, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
-  tags         = ["foo", "bar"]
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
+	tags         = ["foo", "bar"]
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-      public_ptr_domain_name = "%s.gcp.tfacc.hashicorptest.com."
-    }
-  }
+	network_interface {
+		network = "default"
+		access_config {
+			public_ptr_domain_name = "%s.gcp.tfacc.hashicorptest.com."
+		}
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, instance, record)
 }
@@ -2175,27 +2173,27 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_networkTier(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-    access_config {
-      network_tier = "STANDARD"
-    }
-  }
+	network_interface {
+		network = "default"
+		access_config {
+			network_tier = "STANDARD"
+		}
+	}
 }
 `, instance)
 }
@@ -2207,88 +2205,88 @@ func testAccComputeInstance_disks_encryption(bootEncryptionKey string, diskNameT
 	}
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    raw_key = "%s"
-  }
+	disk_encryption_key {
+		raw_key = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar2" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    raw_key = "%s"
-  }
+	disk_encryption_key {
+		raw_key = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar3" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    raw_key = "%s"
-  }
+	disk_encryption_key {
+		raw_key = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar4" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-    disk_encryption_key_raw = "%s"
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+		disk_encryption_key_raw = "%s"
+	}
 
-  attached_disk {
-    source                  = google_compute_disk.foobar.self_link
-    disk_encryption_key_raw = "%s"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.self_link}"
+		disk_encryption_key_raw = "%s"
+	}
 
-  attached_disk {
-    source                  = google_compute_disk.foobar2.self_link
-    disk_encryption_key_raw = "%s"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar2.self_link}"
+		disk_encryption_key_raw = "%s"
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar4.self_link
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar4.self_link}"
+	}
 
-  attached_disk {
-    source                  = google_compute_disk.foobar3.self_link
-    disk_encryption_key_raw = "%s"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar3.self_link}"
+		disk_encryption_key_raw = "%s"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, diskNames[0], diskNameToEncryptionKey[diskNames[0]].RawKey,
 		diskNames[1], diskNameToEncryptionKey[diskNames[1]].RawKey,
@@ -2305,105 +2303,105 @@ func testAccComputeInstance_disks_kms(pid string, bootEncryptionKey string, disk
 	}
 	return fmt.Sprintf(`
 data "google_project" "project" {
-  project_id = "%s"
+	project_id = "%s"
 }
 
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
+  project = "${data.google_project.project.project_id}"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
   member  = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
 }
 
 resource "google_compute_disk" "foobar" {
-  depends_on = [google_project_iam_member.kms-project-binding]
+	depends_on = [google_project_iam_member.kms-project-binding]
 
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    kms_key_self_link = "%s"
-  }
+	disk_encryption_key {
+		kms_key_self_link = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar2" {
-  depends_on = [google_project_iam_member.kms-project-binding]
+	depends_on = [google_project_iam_member.kms-project-binding]
 
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    kms_key_self_link = "%s"
-  }
+	disk_encryption_key {
+		kms_key_self_link = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar3" {
-  depends_on = [google_project_iam_member.kms-project-binding]
+	depends_on = [google_project_iam_member.kms-project-binding]
 
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 
-  disk_encryption_key {
-    kms_key_self_link = "%s"
-  }
+	disk_encryption_key {
+		kms_key_self_link = "%s"
+	}
 }
 
 resource "google_compute_disk" "foobar4" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  depends_on = [google_project_iam_member.kms-project-binding]
+	depends_on = [google_project_iam_member.kms-project-binding]
 
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-    kms_key_self_link = "%s"
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+		kms_key_self_link = "%s"
+	}
 
-  attached_disk {
-    source            = google_compute_disk.foobar.self_link
-    kms_key_self_link = "%s"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.self_link}"
+		kms_key_self_link = "%s"
+	}
 
-  attached_disk {
-    source            = google_compute_disk.foobar2.self_link
-    kms_key_self_link = "%s"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar2.self_link}"
+		kms_key_self_link = "%s"
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar4.self_link
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar4.self_link}"
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar3.self_link
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar3.self_link}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, pid, diskNames[0], diskNameToEncryptionKey[diskNames[0]].KmsKeyName,
 		diskNames[1], diskNameToEncryptionKey[diskNames[1]].KmsKeyName,
@@ -2416,35 +2414,35 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_attachedDisk(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar.name
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.name}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2452,35 +2450,35 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_attachedDisk_sourceUrl(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar.self_link
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.self_link}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2488,36 +2486,36 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_attachedDisk_modeRo(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar.self_link
-    mode   = "READ_ONLY"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.self_link}"
+		mode = "READ_ONLY"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2525,46 +2523,46 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_addAttachedDisk(disk, disk2, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_disk" "foobar2" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar.name
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.name}"
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar2.self_link
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar2.self_link}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, disk2, instance)
 }
@@ -2572,42 +2570,42 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_detachDisk(disk, disk2, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_disk" "foobar2" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source = google_compute_disk.foobar.name
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.name}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, disk2, instance)
 }
@@ -2615,39 +2613,39 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_updateAttachedDiskEncryptionKey(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name = "%s"
-  size = 10
-  type = "pd-ssd"
-  zone = "us-central1-a"
-  disk_encryption_key {
-    raw_key = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
-  }
+	name = "%s"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	disk_encryption_key {
+		raw_key = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
+	}
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  attached_disk {
-    source                  = google_compute_disk.foobar.name
-    disk_encryption_key_raw = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
-  }
+	attached_disk {
+		source = "${google_compute_disk.foobar.name}"
+		disk_encryption_key_raw = "c2Vjb25kNzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2655,28 +2653,28 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_bootDisk_source(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name  = "%s"
+	zone  = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    source = google_compute_disk.foobar.name
-  }
+	boot_disk {
+		source = "${google_compute_disk.foobar.name}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2684,28 +2682,28 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_bootDisk_sourceUrl(disk, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name  = "%s"
+	zone  = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    source = google_compute_disk.foobar.self_link
-  }
+	boot_disk {
+		source = "${google_compute_disk.foobar.self_link}"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, disk, instance)
 }
@@ -2713,25 +2711,25 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_bootDisk_type(instance string, diskType string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-      type  = "%s"
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image	= "${data.google_compute_image.my_image.self_link}"
+			type	= "%s"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, instance, diskType)
 }
@@ -2739,27 +2737,27 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_bootDisk_mode(instance string, diskMode string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-      type  = "pd-ssd"
-    }
+	boot_disk {
+		initialize_params {
+			image	= "${data.google_compute_image.my_image.self_link}"
+			type	= "pd-ssd"
+		}
 
-    mode = "%s"
-  }
+		mode = "%s"
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, instance, diskMode)
 }
@@ -2767,32 +2765,33 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_scratchDisk(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "scratch" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  scratch_disk {
-    interface = "NVME"
-  }
+	scratch_disk {
+		interface = "NVME"
+	}
 
-  scratch_disk {
-    interface = "SCSI"
-  }
+	scratch_disk {
+		interface = "SCSI"
+	}
+
+	network_interface {
+		network = "default"
+	}
 
-  network_interface {
-    network = "default"
-  }
 }
 `, instance)
 }
@@ -2800,32 +2799,32 @@ resource "google_compute_instance" "scratch" {
 func testAccComputeInstance_serviceAccount(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  service_account {
-    scopes = [
-      "userinfo-email",
-      "compute-ro",
-      "storage-ro",
-    ]
-  }
+	service_account {
+		scopes = [
+			"userinfo-email",
+			"compute-ro",
+			"storage-ro",
+		]
+	}
 }
 `, instance)
 }
@@ -2833,28 +2832,28 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_scheduling(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    automatic_restart = false
-  }
+	scheduling {
+		automatic_restart = false
+	}
 }
 `, instance)
 }
@@ -2862,29 +2861,29 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_schedulingUpdated(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    automatic_restart = false
-    preemptible       = true
-  }
+	scheduling {
+		automatic_restart = false
+		preemptible = true
+	}
 }
 `, instance)
 }
@@ -2892,32 +2891,32 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_subnet_auto(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "inst-test-network-%s"
+	name = "inst-test-network-%s"
 
-  auto_create_subnetworks = true
+	auto_create_subnetworks = true
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		network = "${google_compute_network.inst-test-network.name}"
+		access_config {	}
+	}
 
-  network_interface {
-    network = google_compute_network.inst-test-network.name
-    access_config {
-    }
-  }
 }
 `, acctest.RandString(10), instance)
 }
@@ -2925,39 +2924,39 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_subnet_custom(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "inst-test-network-%s"
+	name = "inst-test-network-%s"
 
-  auto_create_subnetworks = false
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "inst-test-subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.inst-test-network.self_link
+	name          = "inst-test-subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.self_link}"
+		access_config {	}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.self_link
-    access_config {
-    }
-  }
 }
 `, acctest.RandString(10), acctest.RandString(10), instance)
 }
@@ -2965,76 +2964,77 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_subnet_xpn(org, billingId, projectName, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_project" "host_project" {
-  name            = "Test Project XPN Host"
-  project_id      = "%s-host"
-  org_id          = "%s"
-  billing_account = "%s"
+	name = "Test Project XPN Host"
+	project_id = "%s-host"
+	org_id = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "host_project" {
-  project = google_project.host_project.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.host_project.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_compute_shared_vpc_host_project" "host_project" {
-  project = google_project_service.host_project.project
+	project = "${google_project_service.host_project.project}"
 }
 
 resource "google_project" "service_project" {
-  name            = "Test Project XPN Service"
-  project_id      = "%s-service"
-  org_id          = "%s"
-  billing_account = "%s"
+	name = "Test Project XPN Service"
+	project_id = "%s-service"
+	org_id = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "service_project" {
-  project = google_project.service_project.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.service_project.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_compute_shared_vpc_service_project" "service_project" {
-  host_project    = google_compute_shared_vpc_host_project.host_project.project
-  service_project = google_project_service.service_project.project
+	host_project = "${google_compute_shared_vpc_host_project.host_project.project}"
+	service_project = "${google_project_service.service_project.project}"
 }
 
+
 resource "google_compute_network" "inst-test-network" {
-  name    = "inst-test-network-%s"
-  project = google_compute_shared_vpc_host_project.host_project.project
+	name    = "inst-test-network-%s"
+	project = "${google_compute_shared_vpc_host_project.host_project.project}"
 
-  auto_create_subnetworks = false
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "inst-test-subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.inst-test-network.self_link
-  project       = google_compute_shared_vpc_host_project.host_project.project
+	name          = "inst-test-subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
+	project       = "${google_compute_shared_vpc_host_project.host_project.project}"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
-  project      = google_compute_shared_vpc_service_project.service_project.service_project
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
+	project       = "${google_compute_shared_vpc_service_project.service_project.service_project}"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		subnetwork         = "${google_compute_subnetwork.inst-test-subnetwork.name}"
+		subnetwork_project = "${google_compute_subnetwork.inst-test-subnetwork.project}"
+		access_config {	}
+	}
 
-  network_interface {
-    subnetwork         = google_compute_subnetwork.inst-test-subnetwork.name
-    subnetwork_project = google_compute_subnetwork.inst-test-subnetwork.project
-    access_config {
-    }
-  }
 }
 `, projectName, org, billingId, projectName, org, billingId, acctest.RandString(10), acctest.RandString(10), instance)
 }
@@ -3042,37 +3042,35 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_networkIPAuto(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "inst-test-network-%s"
+	name = "inst-test-network-%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "inst-test-subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.inst-test-network.self_link
+	name          = "inst-test-subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
 }
-
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.name}"
+		access_config {	}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.name
-    access_config {
-    }
-  }
 }
 `, acctest.RandString(10), acctest.RandString(10), instance)
 }
@@ -3080,38 +3078,36 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_network_ip_custom(instance, ipAddress string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "inst-test-network-%s"
+	name = "inst-test-network-%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "inst-test-subnetwork-%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.inst-test-network.self_link
+	name          = "inst-test-subnetwork-%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
 }
-
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
+
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.name}"
+		network_ip    = "%s"
+		access_config {	}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.name
-    network_ip = "%s"
-    access_config {
-    }
-  }
 }
 `, acctest.RandString(10), acctest.RandString(10), instance, ipAddress)
 }
@@ -3119,40 +3115,40 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_private_image_family(disk, family, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  zone  = "us-central1-a"
-  image = data.google_compute_image.my_image.self_link
+	name  = "%s"
+	zone  = "us-central1-a"
+	image = "${data.google_compute_image.my_image.self_link}"
 }
 
 resource "google_compute_image" "foobar" {
-  name        = "%s-1"
-  source_disk = google_compute_disk.foobar.self_link
-  family      = "%s"
+	name        = "%s-1"
+	source_disk = "${google_compute_disk.foobar.self_link}"
+	family      = "%s"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = google_compute_image.foobar.family
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${google_compute_image.foobar.family}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  metadata = {
-    foo = "bar"
-  }
+	metadata = {
+		foo = "bar"
+	}
 }
 `, disk, family, family, instance)
 }
@@ -3160,41 +3156,39 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_multiNic(instance, network, subnetwork string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.name
-    access_config {
-    }
-  }
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.name}"
+		access_config {	}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "%s"
+	name = "%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.inst-test-network.self_link
+	name          = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
 }
 `, instance, network, subnetwork)
 }
@@ -3202,256 +3196,246 @@ resource "google_compute_subnetwork" "inst-test-subnetwork" {
 func testAccComputeInstance_guestAccelerator(instance string, count uint8) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-east1-d"
+	name = "%s"
+	machine_type = "n1-standard-1"
+	zone = "us-east1-d"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  scheduling {
-    # Instances with guest accelerators do not support live migration.
-    on_host_maintenance = "TERMINATE"
-  }
+	scheduling {
+		# Instances with guest accelerators do not support live migration.
+		on_host_maintenance = "TERMINATE"
+	}
 
-  guest_accelerator {
-    count = %d
-    type  = "nvidia-tesla-k80"
-  }
-}
-`, instance, count)
+	guest_accelerator {
+		count = %d
+		type = "nvidia-tesla-k80"
+	}
+}`, instance, count)
 }
 
 func testAccComputeInstance_minCpuPlatform(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-east1-d"
+	name = "%s"
+	machine_type = "n1-standard-1"
+	zone = "us-east1-d"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  min_cpu_platform = "Intel Haswell"
-}
-`, instance)
+	min_cpu_platform = "Intel Haswell"
+}`, instance)
 }
 
 func testAccComputeInstance_primaryAliasIpRange(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-east1-d"
+	name = "%s"
+	machine_type = "n1-standard-1"
+	zone = "us-east1-d"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
+	network_interface {
+		network = "default"
 
-    alias_ip_range {
-      ip_cidr_range = "/24"
-    }
-  }
-}
-`, instance)
+		alias_ip_range {
+			ip_cidr_range = "/24"
+		}
+	}
+}`, instance)
 }
 
 func testAccComputeInstance_secondaryAliasIpRange(network, subnet, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "%s"
+	name = "%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-east1"
-  network       = google_compute_network.inst-test-network.self_link
-  secondary_ip_range {
-    range_name    = "inst-test-secondary"
-    ip_cidr_range = "172.16.0.0/20"
-  }
-  secondary_ip_range {
-    range_name    = "inst-test-tertiary"
-    ip_cidr_range = "10.1.0.0/16"
-  }
+	name          = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-east1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
+	secondary_ip_range {
+		range_name = "inst-test-secondary"
+		ip_cidr_range = "172.16.0.0/20"
+	}
+	secondary_ip_range {
+		range_name = "inst-test-tertiary"
+		ip_cidr_range = "10.1.0.0/16"
+	}
 }
-
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-east1-d"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-east1-d"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.self_link
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.self_link}"
 
-    alias_ip_range {
-      subnetwork_range_name = google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range[0].range_name
-      ip_cidr_range         = "172.16.0.0/24"
-    }
+		alias_ip_range {
+			subnetwork_range_name = "${google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range.0.range_name}"
+			ip_cidr_range         = "172.16.0.0/24"
+		}
 
-    alias_ip_range {
-      subnetwork_range_name = google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range[1].range_name
-      ip_cidr_range         = "10.1.0.0/20"
-    }
-  }
-}
-`, network, subnet, instance)
+		alias_ip_range {
+			subnetwork_range_name = "${google_compute_subnetwork.inst-test-subnetwork.secondary_ip_range.1.range_name}"
+			ip_cidr_range         = "10.1.0.0/20"
+		}
+	}
+}`, network, subnet, instance)
 }
 
 func testAccComputeInstance_secondaryAliasIpRangeUpdate(network, subnet, instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_network" "inst-test-network" {
-  name = "%s"
+	name = "%s"
 }
-
 resource "google_compute_subnetwork" "inst-test-subnetwork" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-east1"
-  network       = google_compute_network.inst-test-network.self_link
-  secondary_ip_range {
-    range_name    = "inst-test-secondary"
-    ip_cidr_range = "172.16.0.0/20"
-  }
-  secondary_ip_range {
-    range_name    = "inst-test-tertiary"
-    ip_cidr_range = "10.1.0.0/16"
-  }
+	name          = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-east1"
+	network       = "${google_compute_network.inst-test-network.self_link}"
+	secondary_ip_range {
+		range_name    = "inst-test-secondary"
+		ip_cidr_range = "172.16.0.0/20"
+	}
+	secondary_ip_range {
+		range_name = "inst-test-tertiary"
+		ip_cidr_range = "10.1.0.0/16"
+	}
 }
-
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-east1-d"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-east1-d"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params {
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.inst-test-subnetwork.self_link
-    alias_ip_range {
-      ip_cidr_range = "10.0.1.0/24"
-    }
-  }
-}
-`, network, subnet, instance)
+	network_interface {
+		subnetwork = "${google_compute_subnetwork.inst-test-subnetwork.self_link}"
+		alias_ip_range {
+			ip_cidr_range = "10.0.1.0/24"
+		}
+	}
+}`, network, subnet, instance)
 }
 
 func testAccComputeInstance_hostname(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  zone           = "us-central1-a"
-  can_ip_forward = false
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
+	can_ip_forward = false
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  hostname = "%s.test"
-}
-`, instance, instance)
+	hostname = "%s.test"
+}`, instance, instance)
 }
 
 // Set fields that require stopping the instance: machine_type, min_cpu_platform, and service_account
 func testAccComputeInstance_stopInstanceToUpdate(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  min_cpu_platform = "Intel Broadwell"
-  service_account {
-    scopes = [
-      "userinfo-email",
-      "compute-ro",
-      "storage-ro",
-    ]
-  }
+	min_cpu_platform = "Intel Broadwell"
+	service_account {
+		scopes = [
+			"userinfo-email",
+			"compute-ro",
+			"storage-ro",
+		]
+	}
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 }
 `, instance)
 }
@@ -3460,34 +3444,34 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_stopInstanceToUpdate2(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-2"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-2"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  min_cpu_platform = "Intel Skylake"
-  service_account {
-    scopes = [
-      "userinfo-email",
-      "compute-ro",
-    ]
-  }
+	min_cpu_platform = "Intel Skylake"
+	service_account {
+		scopes = [
+			"userinfo-email",
+			"compute-ro",
+		]
+	}
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 }
 `, instance)
 }
@@ -3496,26 +3480,26 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_stopInstanceToUpdate3(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-2"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-2"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 }
 `, instance)
 }
@@ -3528,13 +3512,13 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
+  name = "%s"
   machine_type = "n1-standard-2"
-  zone         = "us-central1-a"
+  zone = "us-central1-a"
 
   boot_disk {
     initialize_params {
-      image = data.google_compute_image.my_image.self_link
+      image = "${data.google_compute_image.my_image.self_link}"
     }
   }
 
@@ -3544,15 +3528,15 @@ resource "google_compute_instance" "foobar" {
 
   scheduling {
     node_affinities {
-      key      = "tfacc"
+      key = "tfacc"
       operator = "IN"
-      values   = ["test"]
+      values = ["test"]
     }
 
     node_affinities {
-      key      = "compute.googleapis.com/node-group-name"
+      key = "compute.googleapis.com/node-group-name"
       operator = "IN"
-      values   = [google_compute_node_group.nodes.name]
+      values = ["${google_compute_node_group.nodes.name}"]
     }
   }
 }
@@ -3561,23 +3545,24 @@ data "google_compute_node_types" "central1a" {
   zone = "us-central1-a"
 }
 
+
 resource "google_compute_node_template" "nodetmpl" {
-  name   = "%s"
+  name = "%s"
   region = "us-central1"
 
   node_affinity_labels = {
     tfacc = "test"
   }
 
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "${data.google_compute_node_types.central1a.names[0]}"
 }
 
 resource "google_compute_node_group" "nodes" {
   name = "%s"
   zone = "us-central1-a"
 
-  size          = 1
-  node_template = google_compute_node_template.nodetmpl.self_link
+  size = 1
+  node_template = "${google_compute_node_template.nodetmpl.self_link}"
 }
 `, instance, nodeTemplate, nodeGroup)
 }
@@ -3590,13 +3575,13 @@ data "google_compute_image" "my_image" {
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
+  name = "%s"
   machine_type = "n1-standard-2"
-  zone         = "us-central1-a"
+  zone = "us-central1-a"
 
   boot_disk {
     initialize_params {
-      image = data.google_compute_image.my_image.self_link
+      image = "${data.google_compute_image.my_image.self_link}"
     }
   }
 
@@ -3606,15 +3591,15 @@ resource "google_compute_instance" "foobar" {
 
   scheduling {
     node_affinities {
-      key      = "tfacc"
+      key = "tfacc"
       operator = "IN"
-      values   = ["test", "updatedlabel"]
+      values = ["test", "updatedlabel"]
     }
 
     node_affinities {
-      key      = "compute.googleapis.com/node-group-name"
+      key = "compute.googleapis.com/node-group-name"
       operator = "IN"
-      values   = [google_compute_node_group.nodes.name]
+      values = ["${google_compute_node_group.nodes.name}"]
     }
   }
 }
@@ -3623,23 +3608,24 @@ data "google_compute_node_types" "central1a" {
   zone = "us-central1-a"
 }
 
+
 resource "google_compute_node_template" "nodetmpl" {
-  name   = "%s"
+  name = "%s"
   region = "us-central1"
 
   node_affinity_labels = {
     tfacc = "test"
   }
 
-  node_type = data.google_compute_node_types.central1a.names[0]
+  node_type = "${data.google_compute_node_types.central1a.names[0]}"
 }
 
 resource "google_compute_node_group" "nodes" {
   name = "%s"
   zone = "us-central1-a"
 
-  size          = 1
-  node_template = google_compute_node_template.nodetmpl.self_link
+  size = 1
+  node_template = "${google_compute_node_template.nodetmpl.self_link}"
 }
 `, instance, nodeTemplate, nodeGroup)
 }
@@ -3647,30 +3633,30 @@ resource "google_compute_node_group" "nodes" {
 func testAccComputeInstance_shieldedVmConfig(instance string, enableSecureBoot bool, enableVtpm bool, enableIntegrityMonitoring bool) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "centos-7"
-  project = "gce-uefi-images"
+	family  = "centos-7"
+	project = "gce-uefi-images"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  shielded_instance_config {
-    enable_secure_boot          = %t
-    enable_vtpm                 = %t
-    enable_integrity_monitoring = %t
-  }
+	shielded_instance_config {
+		enable_secure_boot          = %t
+		enable_vtpm                 = %t
+		enable_integrity_monitoring = %t
+	}
 }
 `, instance, enableSecureBoot, enableVtpm, enableIntegrityMonitoring)
 }
@@ -3678,28 +3664,28 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_enableDisplay(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "centos-7"
-  project = "gce-uefi-images"
+	family  = "centos-7"
+	project = "gce-uefi-images"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  enable_display = true
+	enable_display = true
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 }
 `, instance)
 }
@@ -3707,28 +3693,28 @@ resource "google_compute_instance" "foobar" {
 func testAccComputeInstance_enableDisplayUpdated(instance string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "centos-7"
-  project = "gce-uefi-images"
+	family  = "centos-7"
+	project = "gce-uefi-images"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name           = "%s"
+	machine_type   = "n1-standard-1"
+	zone           = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 
-  enable_display = false
+	enable_display = false
 
-  allow_stopping_for_update = true
+	allow_stopping_for_update = true
 }
 `, instance)
 }
diff --git a/google/resource_compute_network_endpoint_test.go b/google/resource_compute_network_endpoint_test.go
index 48935856901..6f9b80d567b 100644
--- a/google/resource_compute_network_endpoint_test.go
+++ b/google/resource_compute_network_endpoint_test.go
@@ -80,12 +80,12 @@ func TestAccComputeNetworkEndpoint_networkEndpointsBasic(t *testing.T) {
 func testAccComputeNetworkEndpoint_networkEndpointsBasic(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_network_endpoint" "default" {
-  zone                   = "us-central1-a"
-  network_endpoint_group = google_compute_network_endpoint_group.neg.name
+ zone                   = "us-central1-a"
+ network_endpoint_group = "${google_compute_network_endpoint_group.neg.name}"
 
-  instance   = google_compute_instance.default.name
-  ip_address = google_compute_instance.default.network_interface[0].network_ip
-  port       = google_compute_network_endpoint_group.neg.default_port
+ instance    = "${google_compute_instance.default.name}"
+ ip_address  = "${google_compute_instance.default.network_interface.0.network_ip}"
+ port        = "${google_compute_network_endpoint_group.neg.default_port}"
 }
 `, context) + testAccComputeNetworkEndpoint_noNetworkEndpoints(context)
 }
@@ -93,89 +93,88 @@ resource "google_compute_network_endpoint" "default" {
 func testAccComputeNetworkEndpoint_networkEndpointsModified(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_network_endpoint" "default" {
-  zone                   = "us-central1-a"
-  network_endpoint_group = google_compute_network_endpoint_group.neg.name
+ zone                   = "us-central1-a"
+ network_endpoint_group = "${google_compute_network_endpoint_group.neg.name}"
 
-  instance   = google_compute_instance.default.name
-  ip_address = google_compute_instance.default.network_interface[0].network_ip
-  port       = "%{modified_port}"
-}
-`, context) + testAccComputeNetworkEndpoint_noNetworkEndpoints(context)
+ instance    = "${google_compute_instance.default.name}"
+ ip_address  = "${google_compute_instance.default.network_interface.0.network_ip}"
+ port        = "%{modified_port}"
+}`, context) + testAccComputeNetworkEndpoint_noNetworkEndpoints(context)
 }
 
 func testAccComputeNetworkEndpoint_networkEndpointsAdditional(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_network_endpoint" "default" {
-  zone                   = "us-central1-a"
-  network_endpoint_group = google_compute_network_endpoint_group.neg.name
+ zone                   = "us-central1-a"
+ network_endpoint_group = "${google_compute_network_endpoint_group.neg.name}"
 
-  instance   = google_compute_instance.default.name
-  ip_address = google_compute_instance.default.network_interface[0].network_ip
-  port       = "%{modified_port}"
+ instance    = "${google_compute_instance.default.name}"
+ ip_address  = "${google_compute_instance.default.network_interface.0.network_ip}"
+ port        = "%{modified_port}"
 }
 
 resource "google_compute_network_endpoint" "add1" {
-  zone                   = "us-central1-a"
-  network_endpoint_group = google_compute_network_endpoint_group.neg.name
+ zone                   = "us-central1-a"
+ network_endpoint_group = "${google_compute_network_endpoint_group.neg.name}"
 
-  instance   = google_compute_instance.default.name
-  ip_address = google_compute_instance.default.network_interface[0].network_ip
-  port       = "%{add1_port}"
+ instance    = "${google_compute_instance.default.name}"
+ ip_address  = "${google_compute_instance.default.network_interface.0.network_ip}"
+ port        = "%{add1_port}"
 }
 
 resource "google_compute_network_endpoint" "add2" {
-  zone                   = "us-central1-a"
-  network_endpoint_group = google_compute_network_endpoint_group.neg.name
+ zone                   = "us-central1-a"
+ network_endpoint_group = "${google_compute_network_endpoint_group.neg.name}"
 
-  instance   = google_compute_instance.default.name
-  ip_address = google_compute_instance.default.network_interface[0].network_ip
-  port       = "%{add2_port}"
+ instance    = "${google_compute_instance.default.name}"
+ ip_address  = "${google_compute_instance.default.network_interface.0.network_ip}"
+ port        = "%{add2_port}"
 }
+
 `, context) + testAccComputeNetworkEndpoint_noNetworkEndpoints(context)
 }
 
 func testAccComputeNetworkEndpoint_noNetworkEndpoints(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_compute_network_endpoint_group" "neg" {
-  name         = "neg-%{random_suffix}"
-  zone         = "us-central1-a"
-  network      = google_compute_network.default.self_link
-  subnetwork   = google_compute_subnetwork.default.self_link
-  default_port = "%{default_port}"
+ name         = "neg-%{random_suffix}"
+ zone         = "us-central1-a"
+ network      = "${google_compute_network.default.self_link}"
+ subnetwork   = "${google_compute_subnetwork.default.self_link}"
+ default_port = "%{default_port}"
 }
 
 resource "google_compute_network" "default" {
-  name                    = "neg-network-%{random_suffix}"
-  auto_create_subnetworks = false
+ name = "neg-network-%{random_suffix}"
+ auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "default" {
-  name          = "neg-subnetwork-%{random_suffix}"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.default.self_link
+ name          = "neg-subnetwork-%{random_suffix}"
+ ip_cidr_range = "10.0.0.0/16"
+ region        = "us-central1"
+ network       = "${google_compute_network.default.self_link}"
 }
 
 resource "google_compute_instance" "default" {
-  name         = "neg-instance1-%{random_suffix}"
-  machine_type = "n1-standard-1"
+ name         =  "neg-instance1-%{random_suffix}"
+ machine_type = "n1-standard-1"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+ boot_disk {
+   initialize_params{
+     image = "${data.google_compute_image.my_image.self_link}"
+   }
+ }
 
-  network_interface {
-    subnetwork = google_compute_subnetwork.default.self_link
-    access_config {
-    }
-  }
+ network_interface {
+   subnetwork = "${google_compute_subnetwork.default.self_link}"
+   access_config { }
+ }
 }
 
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+ family  = "debian-9"
+ project = "debian-cloud"
 }
 `, context)
 }
diff --git a/google/resource_compute_network_peering_test.go b/google/resource_compute_network_peering_test.go
index c03d62da09e..53727b81026 100644
--- a/google/resource_compute_network_peering_test.go
+++ b/google/resource_compute_network_peering_test.go
@@ -99,27 +99,27 @@ func testAccCheckComputeNetworkPeeringAutoCreateRoutes(v bool, peering *computeB
 
 func testAccComputeNetworkPeering_basic() string {
 	s := `
-resource "google_compute_network" "network1" {
-  name                    = "network-test-1-%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "network1" {
+		name = "network-test-1-%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_network" "network2" {
-  name                    = "network-test-2-%s"
-  auto_create_subnetworks = false
-}
+	resource "google_compute_network" "network2" {
+		name = "network-test-2-%s"
+		auto_create_subnetworks = false
+	}
 
-resource "google_compute_network_peering" "foo" {
-  name         = "peering-test-1-%s"
-  network      = google_compute_network.network1.self_link
-  peer_network = google_compute_network.network2.self_link
-}
+	resource "google_compute_network_peering" "foo" {
+		name = "peering-test-1-%s"
+		network = "${google_compute_network.network1.self_link}"
+		peer_network = "${google_compute_network.network2.self_link}"
+	}
 
-resource "google_compute_network_peering" "bar" {
-  network      = google_compute_network.network2.self_link
-  peer_network = google_compute_network.network1.self_link
-  name         = "peering-test-2-%s"
-`
+	resource "google_compute_network_peering" "bar" {
+		network = "${google_compute_network.network2.self_link}"
+		peer_network = "${google_compute_network.network1.self_link}"
+		name = "peering-test-2-%s"
+		`
 
 	s = s + `}`
 	return fmt.Sprintf(s, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
diff --git a/google/resource_compute_network_test.go b/google/resource_compute_network_test.go
index adadf03a1b2..ffea9c27cda 100644
--- a/google/resource_compute_network_test.go
+++ b/google/resource_compute_network_test.go
@@ -245,36 +245,32 @@ func testAccCheckComputeNetworkHasRoutingMode(n string, network *compute.Network
 func testAccComputeNetwork_basic() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "bar" {
-  name                    = "network-test-%s"
-  auto_create_subnetworks = true
-}
-`, acctest.RandString(10))
+	name = "network-test-%s"
+	auto_create_subnetworks = true
+}`, acctest.RandString(10))
 }
 
 func testAccComputeNetwork_custom_subnet() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "baz" {
-  name                    = "network-test-%s"
-  auto_create_subnetworks = false
-}
-`, acctest.RandString(10))
+	name = "network-test-%s"
+	auto_create_subnetworks = false
+}`, acctest.RandString(10))
 }
 
 func testAccComputeNetwork_routing_mode(network, routingMode string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "acc_network_routing_mode" {
-  name         = "network-test-%s"
-  routing_mode = "%s"
-}
-`, network, routingMode)
+	name         = "network-test-%s"
+	routing_mode = "%s"
+}`, network, routingMode)
 }
 
 func testAccComputeNetwork_deleteDefaultRoute() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "bar" {
-  name                            = "network-test-%s"
-  delete_default_routes_on_create = true
-  auto_create_subnetworks         = false
-}
-`, acctest.RandString(10))
+	name = "network-test-%s"
+	delete_default_routes_on_create = true
+	auto_create_subnetworks = false
+}`, acctest.RandString(10))
 }
diff --git a/google/resource_compute_node_group_test.go b/google/resource_compute_node_group_test.go
index 6ddcebdbc6b..854dff628a7 100644
--- a/google/resource_compute_node_group_test.go
+++ b/google/resource_compute_node_group_test.go
@@ -92,24 +92,24 @@ data "google_compute_node_types" "central1a" {
 }
 
 resource "google_compute_node_template" "tmpl1" {
-  name      = "%s-first"
-  region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  name = "%s-first"
+  region = "us-central1"
+  node_type = "${data.google_compute_node_types.central1a.names[0]}"
 }
 
 resource "google_compute_node_template" "tmpl2" {
-  name      = "%s-second"
-  region    = "us-central1"
-  node_type = data.google_compute_node_types.central1a.names[0]
+  name = "%s-second"
+  region = "us-central1"
+  node_type = "${data.google_compute_node_types.central1a.names[0]}"
 }
 
 resource "google_compute_node_group" "nodes" {
-  name        = "%s"
-  zone        = "us-central1-a"
+  name = "%s"
+  zone = "us-central1-a"
   description = "example google_compute_node_group for Terraform Google Provider"
 
-  size          = 0
-  node_template = google_compute_node_template.%s.self_link
+  size = 0
+  node_template = "${google_compute_node_template.%s.self_link}"
 }
 `, tmplPrefix, tmplPrefix, groupName, tmplToUse)
 }
diff --git a/google/resource_compute_project_default_network_tier_test.go b/google/resource_compute_project_default_network_tier_test.go
index 819ca4a56bb..69b99737302 100644
--- a/google/resource_compute_project_default_network_tier_test.go
+++ b/google/resource_compute_project_default_network_tier_test.go
@@ -73,16 +73,15 @@ resource "google_project" "project" {
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_default_network_tier" "fizzbuzz" {
-  project      = google_project.project.project_id
+  project      = "${google_project.project.project_id}"
   network_tier = "PREMIUM"
-  depends_on   = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on   = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
 
 func testAccComputeProject_defaultNetworkTier_standard(projectID, name, org, billing string) string {
@@ -95,14 +94,13 @@ resource "google_project" "project" {
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_default_network_tier" "fizzbuzz" {
-  project      = google_project.project.project_id
+  project      = "${google_project.project.project_id}"
   network_tier = "STANDARD"
-  depends_on   = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on   = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
diff --git a/google/resource_compute_project_metadata_test.go b/google/resource_compute_project_metadata_test.go
index d3197da2668..5758676db50 100644
--- a/google/resource_compute_project_metadata_test.go
+++ b/google/resource_compute_project_metadata_test.go
@@ -122,101 +122,97 @@ func testAccCheckComputeProjectMetadataDestroy(s *terraform.State) error {
 func testAccComputeProject_basic0_metadata(projectID, name, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "project" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
+  project_id = "%s"
+  name = "%s"
+  org_id = "%s"
   billing_account = "%s"
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_metadata" "fizzbuzz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   metadata = {
     banana = "orange"
-    sofa   = "darwinism"
+    sofa = "darwinism"
   }
-  depends_on = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
 
 func testAccComputeProject_basic1_metadata(projectID, name, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "project" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
+  project_id = "%s"
+  name = "%s"
+  org_id = "%s"
   billing_account = "%s"
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_metadata" "fizzbuzz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   metadata = {
-    kiwi    = "papaya"
+    kiwi = "papaya"
     finches = "darwinism"
   }
-  depends_on = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
 
 func testAccComputeProject_modify0_metadata(projectID, name, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "project" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
+  project_id = "%s"
+  name = "%s"
+  org_id = "%s"
   billing_account = "%s"
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_metadata" "fizzbuzz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   metadata = {
-    paper        = "pen"
+    paper = "pen"
     genghis_khan = "french bread"
-    happy        = "smiling"
+    happy = "smiling"
   }
-  depends_on = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
 
 func testAccComputeProject_modify1_metadata(projectID, name, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "project" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
+  project_id = "%s"
+  name = "%s"
+  org_id = "%s"
   billing_account = "%s"
 }
 
 resource "google_project_service" "compute" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   service = "compute.googleapis.com"
 }
 
 resource "google_compute_project_metadata" "fizzbuzz" {
-  project = google_project.project.project_id
+  project = "${google_project.project.project_id}"
   metadata = {
     paper = "pen"
     paris = "french bread"
     happy = "laughing"
   }
-  depends_on = [google_project_service.compute]
-}
-`, projectID, name, org, billing)
+  depends_on = ["google_project_service.compute"]
+}`, projectID, name, org, billing)
 }
diff --git a/google/resource_compute_region_autoscaler_test.go b/google/resource_compute_region_autoscaler_test.go
index b6d7f2eb914..6da6448e842 100644
--- a/google/resource_compute_region_autoscaler_test.go
+++ b/google/resource_compute_region_autoscaler_test.go
@@ -42,62 +42,63 @@ func TestAccComputeRegionAutoscaler_update(t *testing.T) {
 func testAccComputeRegionAutoscaler_basic(it_name, tp_name, igm_name, autoscaler_name string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_target_pool" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
 
 resource "google_compute_region_instance_group_manager" "foobar" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
-  }
-  target_pools       = [google_compute_target_pool.foobar.self_link]
-  base_instance_name = "foobar"
-  region             = "us-central1"
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
+	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
+	base_instance_name = "foobar"
+	region = "us-central1"
 }
 
 resource "google_compute_region_autoscaler" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  region      = "us-central1"
-  target      = google_compute_region_instance_group_manager.foobar.self_link
-  autoscaling_policy {
-    max_replicas    = 5
-    min_replicas    = 0
-    cooldown_period = 60
-    cpu_utilization {
-      target = 0.5
-    }
-  }
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	region = "us-central1"
+	target = "${google_compute_region_instance_group_manager.foobar.self_link}"
+	autoscaling_policy {
+		max_replicas = 5
+		min_replicas = 0
+		cooldown_period = 60
+		cpu_utilization {
+			target = 0.5
+		}
+	}
+
 }
 `, it_name, tp_name, igm_name, autoscaler_name)
 }
@@ -105,62 +106,63 @@ resource "google_compute_region_autoscaler" "foobar" {
 func testAccComputeRegionAutoscaler_update(it_name, tp_name, igm_name, autoscaler_name string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "foobar" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_target_pool" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
 
 resource "google_compute_region_instance_group_manager" "foobar" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
-  }
-  target_pools       = [google_compute_target_pool.foobar.self_link]
-  base_instance_name = "foobar"
-  region             = "us-central1"
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.foobar.self_link}"
+		name = "primary"
+	}
+	target_pools = ["${google_compute_target_pool.foobar.self_link}"]
+	base_instance_name = "foobar"
+	region = "us-central1"
 }
 
 resource "google_compute_region_autoscaler" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  region      = "us-central1"
-  target      = google_compute_region_instance_group_manager.foobar.self_link
-  autoscaling_policy {
-    max_replicas    = 10
-    min_replicas    = 1
-    cooldown_period = 60
-    cpu_utilization {
-      target = 0.5
-    }
-  }
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	region = "us-central1"
+	target = "${google_compute_region_instance_group_manager.foobar.self_link}"
+	autoscaling_policy {
+		max_replicas = 10
+		min_replicas = 1
+		cooldown_period = 60
+		cpu_utilization {
+			target = 0.5
+		}
+	}
+
 }
 `, it_name, tp_name, igm_name, autoscaler_name)
 }
diff --git a/google/resource_compute_region_backend_service_test.go b/google/resource_compute_region_backend_service_test.go
index 69caf840c82..498cc19ddf6 100644
--- a/google/resource_compute_region_backend_service_test.go
+++ b/google/resource_compute_region_backend_service_test.go
@@ -134,9 +134,9 @@ func TestAccComputeRegionBackendService_withConnectionDrainingAndUpdate(t *testi
 func testAccComputeRegionBackendService_basic(serviceName, checkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_backend_service" "foobar" {
-  name          = "%s"
-  health_checks = [google_compute_health_check.zero.self_link]
-  region        = "us-central1"
+  name                  = "%s"
+  health_checks         = ["${google_compute_health_check.zero.self_link}"]
+  region                = "us-central1"
 }
 
 resource "google_compute_health_check" "zero" {
@@ -154,29 +154,29 @@ resource "google_compute_health_check" "zero" {
 func testAccComputeRegionBackendService_basicModified(serviceName, checkOne, checkTwo string) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_backend_service" "foobar" {
-  name          = "%s"
-  health_checks = [google_compute_health_check.one.self_link]
-  region        = "us-central1"
+    name = "%s"
+    health_checks = ["${google_compute_health_check.one.self_link}"]
+    region = "us-central1"
 }
 
 resource "google_compute_health_check" "zero" {
-  name               = "%s"
-  check_interval_sec = 1
-  timeout_sec        = 1
+    name = "%s"
+    check_interval_sec = 1
+    timeout_sec = 1
 
-  tcp_health_check {
-    port = 443
-  }
+    tcp_health_check {
+      port = 443
+    }
 }
 
 resource "google_compute_health_check" "one" {
-  name               = "%s"
-  check_interval_sec = 30
-  timeout_sec        = 30
+    name = "%s"
+    check_interval_sec = 30
+    timeout_sec = 30
 
-  tcp_health_check {
-    port = 443
-  }
+    tcp_health_check {
+      port = 443
+    }
 }
 `, serviceName, checkOne, checkTwo)
 }
@@ -197,17 +197,17 @@ resource "google_compute_region_backend_service" "lipsum" {
   timeout_sec = %v
 
   backend {
-    group    = google_compute_instance_group_manager.foobar.instance_group
+    group = "${google_compute_instance_group_manager.foobar.instance_group}"
   }
 
-  health_checks = [google_compute_health_check.default.self_link]
+  health_checks = ["${google_compute_health_check.default.self_link}"]
 }
 
 resource "google_compute_instance_group_manager" "foobar" {
-  name = "%s"
+  name               = "%s"
   version {
-    instance_template = google_compute_instance_template.foobar.self_link
-    name              = "primary"
+    instance_template  = "${google_compute_instance_template.foobar.self_link}"
+    name               = "primary"
   }
   base_instance_name = "foobar"
   zone               = "us-central1-f"
@@ -223,7 +223,7 @@ resource "google_compute_instance_template" "foobar" {
   }
 
   disk {
-    source_image = data.google_compute_image.my_image.self_link
+    source_image = "${data.google_compute_image.my_image.self_link}"
     auto_delete  = true
     boot         = true
   }
@@ -244,9 +244,9 @@ resource "google_compute_health_check" "default" {
 func testAccComputeRegionBackendService_withConnectionDraining(serviceName, checkName string, drainingTimeout int64) string {
 	return fmt.Sprintf(`
 resource "google_compute_region_backend_service" "foobar" {
-  name                            = "%s"
-  health_checks                   = [google_compute_health_check.zero.self_link]
-  region                          = "us-central1"
+  name                  = "%s"
+  health_checks         = ["${google_compute_health_check.zero.self_link}"]
+  region                = "us-central1"
   connection_draining_timeout_sec = %v
 }
 
diff --git a/google/resource_compute_region_disk_test.go b/google/resource_compute_region_disk_test.go
index 762172a76cc..9f7e737affd 100644
--- a/google/resource_compute_region_disk_test.go
+++ b/google/resource_compute_region_disk_test.go
@@ -279,138 +279,135 @@ func testAccCheckComputeRegionDiskInstances(n string, disk *computeBeta.Disk) re
 func testAccComputeRegionDisk_basic(diskName, refSelector string) string {
 	return fmt.Sprintf(`
 resource "google_compute_disk" "disk" {
-  name  = "%s"
-  image = "debian-cloud/debian-9"
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "debian-cloud/debian-9"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_snapshot" "snapdisk" {
-  name        = "%s"
-  source_disk = google_compute_disk.disk.name
-  zone        = "us-central1-a"
+	name = "%s"
+	source_disk = "${google_compute_disk.disk.name}"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_region_disk" "regiondisk" {
-  name     = "%s"
-  snapshot = google_compute_snapshot.snapdisk.%s
-  type     = "pd-ssd"
-  region   = "us-central1"
+	name = "%s"
+	snapshot = "${google_compute_snapshot.snapdisk.%s}"
+	type = "pd-ssd"
+	region = "us-central1"
 
-  replica_zones = ["us-central1-a", "us-central1-f"]
-}
-`, diskName, diskName, diskName, refSelector)
+	replica_zones = ["us-central1-a", "us-central1-f"]
+}`, diskName, diskName, diskName, refSelector)
 }
 
 func testAccComputeRegionDisk_basicUpdated(diskName, refSelector string) string {
 	return fmt.Sprintf(`
 resource "google_compute_disk" "disk" {
-  name  = "%s"
-  image = "debian-cloud/debian-9"
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "debian-cloud/debian-9"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_snapshot" "snapdisk" {
-  name        = "%s"
-  source_disk = google_compute_disk.disk.name
-  zone        = "us-central1-a"
+	name = "%s"
+	source_disk = "${google_compute_disk.disk.name}"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_region_disk" "regiondisk" {
-  name     = "%s"
-  snapshot = google_compute_snapshot.snapdisk.%s
-  type     = "pd-ssd"
-  region   = "us-central1"
-
-  replica_zones = ["us-central1-a", "us-central1-f"]
-
-  size = 100
-  labels = {
-    my-label    = "my-updated-label-value"
-    a-new-label = "a-new-label-value"
-  }
-}
-`, diskName, diskName, diskName, refSelector)
+	name     = "%s"
+	snapshot = "${google_compute_snapshot.snapdisk.%s}"
+	type     = "pd-ssd"
+	region   = "us-central1"
+
+	replica_zones = ["us-central1-a", "us-central1-f"]
+
+	size = 100
+	labels = {
+		my-label = "my-updated-label-value"
+		a-new-label = "a-new-label-value"
+	}
+
+}`, diskName, diskName, diskName, refSelector)
 }
 
 func testAccComputeRegionDisk_encryption(diskName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_disk" "disk" {
-  name  = "%s"
-  image = "debian-cloud/debian-9"
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name  = "%s"
+	image = "debian-cloud/debian-9"
+	size  = 50
+	type  = "pd-ssd"
+	zone  = "us-central1-a"
 }
 
 resource "google_compute_snapshot" "snapdisk" {
-  name = "%s"
-  zone = "us-central1-a"
+	name = "%s"
+	zone = "us-central1-a"
 
-  source_disk = google_compute_disk.disk.name
+	source_disk = "${google_compute_disk.disk.name}"
 }
 
 resource "google_compute_region_disk" "regiondisk" {
-  name     = "%s"
-  snapshot = google_compute_snapshot.snapdisk.self_link
-  type     = "pd-ssd"
-  region   = "us-central1"
+	name     = "%s"
+	snapshot = "${google_compute_snapshot.snapdisk.self_link}"
+	type     = "pd-ssd"
+	region   = "us-central1"
 
-  replica_zones = ["us-central1-a", "us-central1-f"]
+	replica_zones = ["us-central1-a", "us-central1-f"]
 
-  disk_encryption_key {
-    raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
-  }
-}
-`, diskName, diskName, diskName)
+	disk_encryption_key {
+		raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
+	}
+}`, diskName, diskName, diskName)
 }
 
 func testAccComputeRegionDisk_deleteDetach(instanceName, diskName, regionDiskName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_disk" "disk" {
-  name  = "%s"
-  image = "debian-cloud/debian-9"
-  size  = 50
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
+	name = "%s"
+	image = "debian-cloud/debian-9"
+	size = 50
+	type = "pd-ssd"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_snapshot" "snapdisk" {
-  name        = "%s"
-  source_disk = google_compute_disk.disk.name
-  zone        = "us-central1-a"
+	name = "%s"
+	source_disk = "${google_compute_disk.disk.name}"
+	zone = "us-central1-a"
 }
 
 resource "google_compute_region_disk" "regiondisk" {
-  name     = "%s"
-  snapshot = google_compute_snapshot.snapdisk.self_link
-  type     = "pd-ssd"
-  region   = "us-central1"
+	name = "%s"
+	snapshot = "${google_compute_snapshot.snapdisk.self_link}"
+	type = "pd-ssd"
+	region = "us-central1"
 
-  replica_zones = ["us-central1-a", "us-central1-f"]
+	replica_zones = ["us-central1-a", "us-central1-f"]
 }
 
 resource "google_compute_instance" "inst" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
-
-  boot_disk {
-    initialize_params {
-      image = "debian-cloud/debian-9"
-    }
-  }
-
-  attached_disk {
-    source = google_compute_region_disk.regiondisk.self_link
-  }
-
-  network_interface {
-    network = "default"
-  }
-}
-`, diskName, diskName, regionDiskName, instanceName)
+	name = "%s"
+	machine_type = "n1-standard-1"
+	zone = "us-central1-a"
+
+	boot_disk {
+		initialize_params {
+			image = "debian-cloud/debian-9"
+		}
+	}
+
+	attached_disk {
+		source = "${google_compute_region_disk.regiondisk.self_link}"
+	}
+
+	network_interface {
+		network = "default"
+	}
+}`, diskName, diskName, regionDiskName, instanceName)
 }
diff --git a/google/resource_compute_region_instance_group_manager_test.go b/google/resource_compute_region_instance_group_manager_test.go
index c6db92936c9..c0094fa1f82 100644
--- a/google/resource_compute_region_instance_group_manager_test.go
+++ b/google/resource_compute_region_instance_group_manager_test.go
@@ -292,753 +292,743 @@ func testAccCheckRegionInstanceGroupManagerDestroy(s *terraform.State) error {
 
 func testAccRegionInstanceGroupManager_basic(template, target, igm1, igm2 string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
-
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-  target_size        = 2
-}
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_target_pool" "igm-basic" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
 
-resource "google_compute_region_instance_group_manager" "igm-no-tp" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+	resource "google_compute_region_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
 
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
+		version {
+			name = "primary"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
 
-  base_instance_name = "igm-no-tp"
-  region             = "us-central1"
-  target_size        = 2
-}
-`, template, target, igm1, igm2)
+		target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+		base_instance_name = "igm-basic"
+		region = "us-central1"
+		target_size = 2
+	}
+
+	resource "google_compute_region_instance_group_manager" "igm-no-tp" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "primary"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
+
+		base_instance_name = "igm-no-tp"
+		region = "us-central1"
+		target_size = 2
+	}
+	`, template, target, igm1, igm2)
 }
 
 func testAccRegionInstanceGroupManager_targetSizeZero(template, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-basic.self_link
-  }
+		network_interface {
+			network = "default"
+		}
 
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-}
-`, template, igm)
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_region_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "primary"
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		}
+
+		base_instance_name = "igm-basic"
+		region = "us-central1"
+	}
+	`, template, igm)
 }
 
 func testAccRegionInstanceGroupManager_update(template, target, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-update" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-update" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_region_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-update.self_link
-  }
-
-  target_pools       = [google_compute_target_pool.igm-update.self_link]
-  base_instance_name = "igm-update"
-  region             = "us-central1"
-  target_size        = 2
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, template, target, igm)
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_target_pool" "igm-update" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_region_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			name = "primary"
+			instance_template = "${google_compute_instance_template.igm-update.self_link}"
+		}
+
+		target_pools = ["${google_compute_target_pool.igm-update.self_link}"]
+		base_instance_name = "igm-update"
+		region = "us-central1"
+		target_size = 2
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+	}`, template, target, igm)
 }
 
 // Change IGM's instance template and target size
 func testAccRegionInstanceGroupManager_update2(template1, target1, target2, template2, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-update" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_target_pool" "igm-update" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-resource "google_compute_target_pool" "igm-update2" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
-}
+		network_interface {
+			network = "default"
+		}
 
-resource "google_compute_instance_template" "igm-update2" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
 
-resource "google_compute_region_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    instance_template = google_compute_instance_template.igm-update2.self_link
-    name              = "primary"
-  }
-
-  target_pools = [
-    google_compute_target_pool.igm-update.self_link,
-    google_compute_target_pool.igm-update2.self_link,
-  ]
-  base_instance_name = "igm-update"
-  region             = "us-central1"
-  target_size        = 3
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-  named_port {
-    name = "customhttps"
-    port = 8443
-  }
-}
-`, template1, target1, target2, template2, igm)
+	resource "google_compute_target_pool" "igm-update" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_target_pool" "igm-update2" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		session_affinity = "CLIENT_IP_PROTO"
+	}
+
+	resource "google_compute_instance_template" "igm-update2" {
+		name = "%s"
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
+
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
+
+		network_interface {
+			network = "default"
+		}
+
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
+
+	resource "google_compute_region_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			instance_template = "${google_compute_instance_template.igm-update2.self_link}"
+			name = "primary"
+		}
+
+		target_pools = [
+			"${google_compute_target_pool.igm-update.self_link}",
+			"${google_compute_target_pool.igm-update2.self_link}",
+		]
+		base_instance_name = "igm-update"
+		region = "us-central1"
+		target_size = 3
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+		named_port {
+			name = "customhttps"
+			port = 8443
+		}
+	}`, template1, target1, target2, template2, igm)
 }
 
 func testAccRegionInstanceGroupManager_updateLifecycle(tag, igm string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-update" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["%s"]
+	resource "google_compute_instance_template" "igm-update" {
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["%s"]
 
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  network_interface {
-    network = "default"
-  }
+		network_interface {
+			network = "default"
+		}
 
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
 
-  lifecycle {
-    create_before_destroy = true
-  }
-}
+		lifecycle {
+			create_before_destroy = true
+		}
+	}
 
-resource "google_compute_region_instance_group_manager" "igm-update" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    instance_template = google_compute_instance_template.igm-update.self_link
-    name              = "primary"
-  }
-
-  base_instance_name = "igm-update"
-  region             = "us-central1"
-  target_size        = 2
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, tag, igm)
+	resource "google_compute_region_instance_group_manager" "igm-update" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			instance_template = "${google_compute_instance_template.igm-update.self_link}"
+			name = "primary"
+		}
+
+		base_instance_name = "igm-update"
+		region = "us-central1"
+		target_size = 2
+		named_port {
+			name = "customhttp"
+			port = 8080
+		}
+	}`, tag, igm)
 }
 
 func testAccRegionInstanceGroupManager_separateRegions(igm1, igm2 string) string {
 	return fmt.Sprintf(`
-data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
-}
+	data "google_compute_image" "my_image" {
+		family  = "debian-9"
+		project = "debian-cloud"
+	}
 
-resource "google_compute_instance_template" "igm-basic" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	resource "google_compute_instance_template" "igm-basic" {
+		machine_type = "n1-standard-1"
+		can_ip_forward = false
+		tags = ["foo", "bar"]
 
-resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+		disk {
+			source_image = "${data.google_compute_image.my_image.self_link}"
+			auto_delete = true
+			boot = true
+		}
 
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "primary"
-  }
+		network_interface {
+			network = "default"
+		}
 
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-  target_size        = 2
-}
+		service_account {
+			scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+		}
+	}
 
-resource "google_compute_region_instance_group_manager" "igm-basic-2" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
+	resource "google_compute_region_instance_group_manager" "igm-basic" {
+		description = "Terraform test instance group manager"
+		name = "%s"
 
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "primary"
-  }
+		version {
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+			name = "primary"
+		}
 
-  base_instance_name = "igm-basic-2"
-  region             = "us-west1"
-  target_size        = 2
-}
-`, igm1, igm2)
+		base_instance_name = "igm-basic"
+		region = "us-central1"
+		target_size = 2
+	}
+
+	resource "google_compute_region_instance_group_manager" "igm-basic-2" {
+		description = "Terraform test instance group manager"
+		name = "%s"
+
+		version {
+			instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+			name = "primary"
+		}
+
+		base_instance_name = "igm-basic-2"
+		region = "us-west1"
+		target_size = 2
+	}
+	`, igm1, igm2)
 }
 
 func testAccRegionInstanceGroupManager_autoHealingPolicies(template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "primary"
-  }
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-  target_size        = 2
-  auto_healing_policies {
-    health_check      = google_compute_http_health_check.zero.self_link
-    initial_delay_sec = "10"
-  }
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		name = "primary"
+	}
+	target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+	base_instance_name = "igm-basic"
+	region = "us-central1"
+	target_size = 2
+	auto_healing_policies {
+		health_check = "${google_compute_http_health_check.zero.self_link}"
+		initial_delay_sec = "10"
+	}
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
-`, template, target, igm, hck)
+	`, template, target, igm, hck)
 }
 
 func testAccRegionInstanceGroupManager_autoHealingPoliciesRemoved(template, target, igm, hck string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
-
 resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-}
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
 
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+}
 resource "google_compute_target_pool" "igm-basic" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  session_affinity = "CLIENT_IP_PROTO"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	session_affinity = "CLIENT_IP_PROTO"
 }
-
 resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "primary"
-  }
-  target_pools       = [google_compute_target_pool.igm-basic.self_link]
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-  target_size        = 2
+	description = "Terraform test instance group manager"
+	name = "%s"
+	version {
+		instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		name = "primary"
+	}
+	target_pools = ["${google_compute_target_pool.igm-basic.self_link}"]
+	base_instance_name = "igm-basic"
+	region = "us-central1"
+	target_size = 2
 }
-
 resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
-`, template, target, igm, hck)
+	`, template, target, igm, hck)
 }
 
 func testAccRegionInstanceGroupManager_versions(primaryTemplate string, canaryTemplate string, igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-primary" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_instance_template" "igm-canary" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description        = "Terraform test region instance group manager"
-  name               = "%s"
-  base_instance_name = "igm-basic"
-  region             = "us-central1"
-  target_size        = 2
-
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-primary.self_link
-  }
-
-  version {
-    name              = "canary"
-    instance_template = google_compute_instance_template.igm-canary.self_link
-    target_size {
-      fixed = 1
-    }
-  }
+	description = "Terraform test region instance group manager"
+	name = "%s"
+	base_instance_name = "igm-basic"
+	region = "us-central1"
+	target_size = 2
+
+	version {
+		name = "primary"
+		instance_template = "${google_compute_instance_template.igm-primary.self_link}"
+	}
+
+	version {
+		name = "canary"
+		instance_template = "${google_compute_instance_template.igm-canary.self_link}"
+		target_size {
+			fixed = 1
+		}
+	}
 }
-`, primaryTemplate, canaryTemplate, igm)
+	`, primaryTemplate, canaryTemplate, igm)
 }
 
 func testAccRegionInstanceGroupManager_distributionPolicy(template, igm string, zones []string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-basic" {
-  name           = "%s"
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["foo", "bar"]
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-  network_interface {
-    network = "default"
-  }
+	name = "%s"
+	machine_type = "n1-standard-1"
+	can_ip_forward = false
+	tags = ["foo", "bar"]
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete = true
+		boot = true
+	}
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-basic" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-
-  version {
-    instance_template = google_compute_instance_template.igm-basic.self_link
-    name              = "primary"
-  }
-
-  base_instance_name        = "igm-basic"
-  region                    = "us-central1"
-  target_size               = 2
-  distribution_policy_zones = ["%s"]
+	description = "Terraform test instance group manager"
+	name = "%s"
+
+	version {
+		instance_template = "${google_compute_instance_template.igm-basic.self_link}"
+		name = "primary"
+	}
+
+	base_instance_name = "igm-basic"
+	region = "us-central1"
+	target_size = 2
+	distribution_policy_zones = ["%s"]
 }
-`, template, igm, strings.Join(zones, "\",\""))
+	`, template, igm, strings.Join(zones, "\",\""))
 }
 
 func testAccRegionInstanceGroupManager_rollingUpdatePolicy(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type   = "n1-standard-1"
+	can_ip_forward = false
+	tags           = ["terraform-testing"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete  = true
+		boot         = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-    name              = "primary"
-  }
-  base_instance_name        = "igm-rolling-update-policy"
-  region                    = "us-central1"
-  target_size               = 4
-  distribution_policy_zones = ["us-central1-a", "us-central1-f"]
-
-  update_policy {
-    type                  = "PROACTIVE"
-    minimal_action        = "REPLACE"
-    max_surge_fixed       = 2
-    max_unavailable_fixed = 2
-    min_ready_sec         = 20
-  }
-
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description        = "Terraform test instance group manager"
+	name               = "%s"
+	version {
+		instance_template  = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+		name = "primary"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	region             = "us-central1"
+	target_size        = 4
+	distribution_policy_zones  = ["us-central1-a", "us-central1-f"]
+
+	update_policy {
+		type                  = "PROACTIVE"
+		minimal_action        = "REPLACE"
+		max_surge_fixed       = 2
+		max_unavailable_fixed = 2
+		min_ready_sec         = 20
+	}
+
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccRegionInstanceGroupManager_rollingUpdatePolicySetToDefault(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  service_account {
-    scopes = ["userinfo-email", "compute-ro", "storage-ro"]
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type   = "n1-standard-1"
+	can_ip_forward = false
+	tags           = ["terraform-testing"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete  = true
+		boot         = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	service_account {
+		scopes = ["userinfo-email", "compute-ro", "storage-ro"]
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-    name              = "primary"
-  }
-  base_instance_name        = "igm-rolling-update-policy"
-  region                    = "us-central1"
-  target_size               = 4
-  distribution_policy_zones = ["us-central1-a", "us-central1-f"]
-
-  update_policy {
-    type                         = "PROACTIVE"
-    instance_redistribution_type = "PROACTIVE"
-    minimal_action               = "REPLACE"
-    max_surge_fixed              = 2
-    max_unavailable_fixed        = 2
-    min_ready_sec                = 20
-  }
-
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description        = "Terraform test instance group manager"
+	name               = "%s"
+	version {
+		instance_template  = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+		name = "primary"
+	}
+	base_instance_name = "igm-rolling-update-policy"
+	region             = "us-central1"
+	target_size        = 4
+	distribution_policy_zones  = ["us-central1-a", "us-central1-f"]
+
+	update_policy {
+		type                         = "PROACTIVE"
+		instance_redistribution_type = "PROACTIVE"
+		minimal_action               = "REPLACE"
+		max_surge_fixed              = 2
+		max_unavailable_fixed        = 2
+		min_ready_sec                = 20
+	}
+
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
 
 func testAccRegionInstanceGroupManager_rollingUpdatePolicy2(igm string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_instance_template" "igm-rolling-update-policy" {
-  machine_type   = "n1-standard-1"
-  can_ip_forward = false
-  tags           = ["terraform-testing"]
-
-  disk {
-    source_image = data.google_compute_image.my_image.self_link
-    auto_delete  = true
-    boot         = true
-  }
-
-  network_interface {
-    network = "default"
-  }
-
-  lifecycle {
-    create_before_destroy = true
-  }
+	machine_type   = "n1-standard-1"
+	can_ip_forward = false
+	tags           = ["terraform-testing"]
+
+	disk {
+		source_image = "${data.google_compute_image.my_image.self_link}"
+		auto_delete  = true
+		boot         = true
+	}
+
+	network_interface {
+		network = "default"
+	}
+
+	lifecycle {
+		create_before_destroy = true
+	}
 }
 
 resource "google_compute_region_instance_group_manager" "igm-rolling-update-policy" {
-  description = "Terraform test instance group manager"
-  name        = "%s"
-  version {
-    name              = "primary"
-    instance_template = google_compute_instance_template.igm-rolling-update-policy.self_link
-  }
-  base_instance_name        = "igm-rolling-update-policy"
-  region                    = "us-central1"
-  distribution_policy_zones = ["us-central1-a", "us-central1-f"]
-  target_size               = 3
-  update_policy {
-    type                         = "PROACTIVE"
-    instance_redistribution_type = "NONE"
-    minimal_action               = "REPLACE"
-    max_surge_fixed              = 2
-    max_unavailable_fixed        = 0
-    min_ready_sec                = 10
-  }
-  named_port {
-    name = "customhttp"
-    port = 8080
-  }
-}
-`, igm)
+	description                = "Terraform test instance group manager"
+	name                       = "%s"
+	version {
+		name              = "primary"
+		instance_template = "${google_compute_instance_template.igm-rolling-update-policy.self_link}"
+	}
+	base_instance_name         = "igm-rolling-update-policy"
+	region                     = "us-central1"
+	distribution_policy_zones  = ["us-central1-a", "us-central1-f"]
+	target_size                = 3
+	update_policy {
+		type                         = "PROACTIVE"
+		instance_redistribution_type = "NONE"
+		minimal_action               = "REPLACE"
+		max_surge_fixed              = 2
+		max_unavailable_fixed        = 0
+		min_ready_sec                = 10
+	}
+	named_port {
+		name = "customhttp"
+		port = 8080
+	}
+}`, igm)
 }
diff --git a/google/resource_compute_route_test.go b/google/resource_compute_route_test.go
index 34dce313483..51b3c7146e4 100644
--- a/google/resource_compute_route_test.go
+++ b/google/resource_compute_route_test.go
@@ -52,13 +52,12 @@ func TestAccComputeRoute_hopInstance(t *testing.T) {
 func testAccComputeRoute_defaultInternetGateway() string {
 	return fmt.Sprintf(`
 resource "google_compute_route" "foobar" {
-  name             = "route-test-%s"
-  dest_range       = "0.0.0.0/0"
-  network          = "default"
-  next_hop_gateway = "default-internet-gateway"
-  priority         = 100
-}
-`, acctest.RandString(10))
+	name = "route-test-%s"
+	dest_range = "0.0.0.0/0"
+	network = "default"
+	next_hop_gateway = "default-internet-gateway"
+	priority = 100
+}`, acctest.RandString(10))
 }
 
 func testAccComputeRoute_hopInstance(instanceName, zone string) string {
@@ -74,8 +73,8 @@ resource "google_compute_instance" "foo" {
   zone         = "%s"
 
   boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
+    initialize_params{
+      image = "${data.google_compute_image.my_image.self_link}"
     }
   }
 
@@ -85,12 +84,11 @@ resource "google_compute_instance" "foo" {
 }
 
 resource "google_compute_route" "foobar" {
-  name                   = "route-test-%s"
-  dest_range             = "0.0.0.0/0"
-  network                = "default"
-  next_hop_instance      = google_compute_instance.foo.name
-  next_hop_instance_zone = google_compute_instance.foo.zone
-  priority               = 100
-}
-`, instanceName, zone, acctest.RandString(10))
+	name = "route-test-%s"
+	dest_range = "0.0.0.0/0"
+	network = "default"
+  	next_hop_instance = "${google_compute_instance.foo.name}"
+  	next_hop_instance_zone = "${google_compute_instance.foo.zone}"
+	priority = 100
+}`, instanceName, zone, acctest.RandString(10))
 }
diff --git a/google/resource_compute_router_interface_test.go b/google/resource_compute_router_interface_test.go
index 82afd077375..a8d1229da92 100644
--- a/google/resource_compute_router_interface_test.go
+++ b/google/resource_compute_router_interface_test.go
@@ -182,207 +182,183 @@ func testAccCheckComputeRouterInterfaceExists(n string) resource.TestCheckFunc {
 
 func testAccComputeRouterInterfaceBasic(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-interface-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-interface-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-interface-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-interface-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-interface-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-interface-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-interface-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-interface-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_router_interface" "foobar" {
-  name     = "router-interface-test-%s"
-  router   = google_compute_router.foobar.name
-  region   = google_compute_router.foobar.region
-  ip_range = "169.254.3.1/30"
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-interface-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-interface-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-interface-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-interface-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-interface-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-interface-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-interface-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-interface-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_router_interface" "foobar" {
+			name    = "router-interface-test-%s"
+			router  = "${google_compute_router.foobar.name}"
+			region  = "${google_compute_router.foobar.region}"
+			ip_range = "169.254.3.1/30"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId, testId)
 }
 
 func testAccComputeRouterInterfaceKeepRouter(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-interface-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-interface-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-interface-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-interface-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-interface-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-interface-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-interface-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-interface-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-interface-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-interface-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-interface-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-interface-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-interface-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-interface-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-interface-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-interface-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId)
 }
 
 func testAccComputeRouterInterfaceWithTunnel(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-interface-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-interface-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-interface-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-interface-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-interface-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-interface-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-interface-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-interface-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "router-interface-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-  router             = google_compute_router.foobar.name
-}
-
-resource "google_compute_router_interface" "foobar" {
-  name       = "router-interface-test-%s"
-  router     = google_compute_router.foobar.name
-  region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
-  vpn_tunnel = google_compute_vpn_tunnel.foobar.name
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-interface-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-interface-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-interface-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-interface-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-interface-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-interface-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-interface-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-interface-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_vpn_tunnel" "foobar" {
+			name = "router-interface-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+			target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+			shared_secret = "unguessable"
+			peer_ip = "8.8.8.8"
+			router = "${google_compute_router.foobar.name}"
+		}
+		resource "google_compute_router_interface" "foobar" {
+			name    = "router-interface-test-%s"
+			router  = "${google_compute_router.foobar.name}"
+			region  = "${google_compute_router.foobar.region}"
+			ip_range = "169.254.3.1/30"
+			vpn_tunnel = "${google_compute_vpn_tunnel.foobar.name}"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
 }
diff --git a/google/resource_compute_router_nat_test.go b/google/resource_compute_router_nat_test.go
index 281d211c68a..0cf65f7016e 100644
--- a/google/resource_compute_router_nat_test.go
+++ b/google/resource_compute_router_nat_test.go
@@ -192,189 +192,177 @@ func testAccCheckComputeRouterNatDelete(n string) resource.TestCheckFunc {
 func testAccComputeRouterNatBasic(testId string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name = "router-nat-test-%s"
+	name = "router-nat-test-%s"
 }
 
 resource "google_compute_subnetwork" "foobar" {
-  name          = "router-nat-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
+	name          = "router-nat-test-subnetwork-%s"
+	network       = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
 }
-
-resource "google_compute_router" "foobar" {
-  name    = "router-nat-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
+resource "google_compute_router" "foobar"{
+	name    = "router-nat-test-%s"
+	region  = "${google_compute_subnetwork.foobar.region}"
+	network = "${google_compute_network.foobar.self_link}"
 }
-
 resource "google_compute_router_nat" "foobar" {
-  name                               = "router-nat-test-%s"
-  router                             = google_compute_router.foobar.name
-  region                             = google_compute_router.foobar.region
-  nat_ip_allocate_option             = "AUTO_ONLY"
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
-  log_config {
-    enable = true
-    filter = "ERRORS_ONLY"
-  }
-}
-`, testId, testId, testId, testId)
+	name                               = "router-nat-test-%s"
+	router                             = "${google_compute_router.foobar.name}"
+	region                             = "${google_compute_router.foobar.region}"
+	nat_ip_allocate_option             = "AUTO_ONLY"
+	source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
+	log_config {
+	  enable = true
+	  filter = "ERRORS_ONLY"
+	}
+}`, testId, testId, testId, testId)
 }
 
 // Like basic but with extra resources
 func testAccComputeRouterNatBasicBeforeUpdate(randPrefix string) string {
 	return fmt.Sprintf(`
-resource "google_compute_router" "foobar" {
-  name    = "router-nat-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
+resource "google_compute_router" "foobar"{
+	name    = "router-nat-test-%s"
+	region  = "${google_compute_subnetwork.foobar.region}"
+	network = "${google_compute_network.foobar.self_link}"
 }
 
 resource "google_compute_network" "foobar" {
-  name = "router-nat-test-%s"
+	name = "router-nat-test-%s"
 }
 
 resource "google_compute_subnetwork" "foobar" {
-  name          = "router-nat-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
+	name          = "router-nat-test-subnetwork-%s"
+	network       = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
 }
 
 resource "google_compute_address" "foobar" {
-  name   = "router-nat-test-%s"
-  region = google_compute_subnetwork.foobar.region
+	name   = "router-nat-test-%s"
+	region = "${google_compute_subnetwork.foobar.region}"
 }
 
 resource "google_compute_router_nat" "foobar" {
-  name                               = "router-nat-test-%s"
-  router                             = google_compute_router.foobar.name
-  region                             = google_compute_router.foobar.region
-  nat_ip_allocate_option             = "AUTO_ONLY"
-  source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
-
-  log_config {
-    enable = true
-    filter = "ERRORS_ONLY"
-  }
-}
-`, randPrefix, randPrefix, randPrefix, randPrefix, randPrefix)
+	name                               = "router-nat-test-%s"
+	router                             = "${google_compute_router.foobar.name}"
+	region                             = "${google_compute_router.foobar.region}"
+	nat_ip_allocate_option             = "AUTO_ONLY"
+	source_subnetwork_ip_ranges_to_nat = "ALL_SUBNETWORKS_ALL_IP_RANGES"
+	
+	log_config {
+	  enable = true
+	  filter = "ERRORS_ONLY"
+	}
+}`, randPrefix, randPrefix, randPrefix, randPrefix, randPrefix)
 }
 
 func testAccComputeRouterNatUpdated(randPrefix string) string {
 	return fmt.Sprintf(`
-resource "google_compute_router" "foobar" {
-  name    = "router-nat-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
+resource "google_compute_router" "foobar"{
+	name    = "router-nat-test-%s"
+	region  = "${google_compute_subnetwork.foobar.region}"
+	network = "${google_compute_network.foobar.self_link}"
 }
 
 resource "google_compute_network" "foobar" {
-  name = "router-nat-test-%s"
+	name = "router-nat-test-%s"
 }
 
 resource "google_compute_subnetwork" "foobar" {
-  name          = "router-nat-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
+	name          = "router-nat-test-subnetwork-%s"
+	network       = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
 }
 
 resource "google_compute_address" "foobar" {
-  name   = "router-nat-test-%s"
-  region = google_compute_subnetwork.foobar.region
+	name   = "router-nat-test-%s"
+	region = "${google_compute_subnetwork.foobar.region}"
 }
 
 resource "google_compute_router_nat" "foobar" {
-  name   = "router-nat-test-%s"
-  router = google_compute_router.foobar.name
-  region = google_compute_router.foobar.region
-
-  nat_ip_allocate_option = "MANUAL_ONLY"
-  nat_ips                = [google_compute_address.foobar.self_link]
-
-  source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
-
-  subnetwork {
-    name                    = google_compute_subnetwork.foobar.self_link
-    source_ip_ranges_to_nat = ["ALL_IP_RANGES"]
-  }
+	name                               = "router-nat-test-%s"
+	router                             = "${google_compute_router.foobar.name}"
+	region                             = "${google_compute_router.foobar.region}"
+	
+	nat_ip_allocate_option             = "MANUAL_ONLY"
+	nat_ips                            = ["${google_compute_address.foobar.self_link}"]
+
+	source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
+
+	subnetwork {
+	  name                    = "${google_compute_subnetwork.foobar.self_link}"
+	  source_ip_ranges_to_nat = ["ALL_IP_RANGES"]
+	}
 
-  udp_idle_timeout_sec             = 60
-  icmp_idle_timeout_sec            = 60
-  tcp_established_idle_timeout_sec = 1600
-  tcp_transitory_idle_timeout_sec  = 60
+	udp_idle_timeout_sec = 60
+	icmp_idle_timeout_sec = 60
+	tcp_established_idle_timeout_sec  = 1600
+	tcp_transitory_idle_timeout_sec  = 60
 
-  log_config {
-    enable = true
-    filter = "TRANSLATIONS_ONLY"
-  }
-}
-`, randPrefix, randPrefix, randPrefix, randPrefix, randPrefix)
+	log_config {
+	  enable = true
+	  filter = "TRANSLATIONS_ONLY"
+	}
+}`, randPrefix, randPrefix, randPrefix, randPrefix, randPrefix)
 }
 
 func testAccComputeRouterNatWithManualIpAndSubnetConfiguration(testId string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name                    = "router-nat-test-%s"
-  auto_create_subnetworks = "false"
+	name                    = "router-nat-test-%s"
+	auto_create_subnetworks = "false"
 }
-
 resource "google_compute_subnetwork" "foobar" {
-  name          = "router-nat-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
+	name          = "router-nat-test-subnetwork-%s"
+	network       = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
 }
-
 resource "google_compute_address" "foobar" {
-  name   = "router-nat-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-nat-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
+	name   = "router-nat-test-%s"
+	region = "${google_compute_subnetwork.foobar.region}"
+}
+resource "google_compute_router" "foobar"{
+	name    = "router-nat-test-%s"
+	region  = "${google_compute_subnetwork.foobar.region}"
+	network = "${google_compute_network.foobar.self_link}"
+	bgp {
+		asn = 64514
+	}
 }
-
 resource "google_compute_router_nat" "foobar" {
-  name                               = "router-nat-test-%s"
-  router                             = google_compute_router.foobar.name
-  region                             = google_compute_router.foobar.region
-  nat_ip_allocate_option             = "MANUAL_ONLY"
-  nat_ips                            = [google_compute_address.foobar.self_link]
-  source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
-  subnetwork {
-    name                    = google_compute_subnetwork.foobar.name
-    source_ip_ranges_to_nat = ["ALL_IP_RANGES"]
-  }
-}
-`, testId, testId, testId, testId, testId)
+	name                               = "router-nat-test-%s"
+	router                             = "${google_compute_router.foobar.name}"
+	region                             = "${google_compute_router.foobar.region}"
+	nat_ip_allocate_option             = "MANUAL_ONLY"
+	nat_ips                            = ["${google_compute_address.foobar.self_link}"]
+	source_subnetwork_ip_ranges_to_nat = "LIST_OF_SUBNETWORKS"
+	subnetwork {
+	  name                    = "${google_compute_subnetwork.foobar.name}"
+	  source_ip_ranges_to_nat = ["ALL_IP_RANGES"]
+	}
+}`, testId, testId, testId, testId, testId)
 }
 
 func testAccComputeRouterNatKeepRouter(testId string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name                    = "router-nat-test-%s"
-  auto_create_subnetworks = "false"
+	name                    = "router-nat-test-%s"
+	auto_create_subnetworks = "false"
 }
-
 resource "google_compute_subnetwork" "foobar" {
-  name          = "router-nat-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
+	name          = "router-nat-test-subnetwork-%s"
+	network       = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region        = "us-central1"
 }
 
-resource "google_compute_router" "foobar" {
-  name    = "router-nat-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.self_link
-}
-`, testId, testId, testId)
+resource "google_compute_router" "foobar"{
+	name    = "router-nat-test-%s"
+	region  = "${google_compute_subnetwork.foobar.region}"
+	network = "${google_compute_network.foobar.self_link}"
+}`, testId, testId, testId)
 }
diff --git a/google/resource_compute_router_peer_test.go b/google/resource_compute_router_peer_test.go
index 8ce3fe76712..dea6027a5cb 100644
--- a/google/resource_compute_router_peer_test.go
+++ b/google/resource_compute_router_peer_test.go
@@ -182,259 +182,230 @@ func testAccCheckComputeRouterPeerExists(n string) resource.TestCheckFunc {
 
 func testAccComputeRouterPeerBasic(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-peer-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-peer-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-peer-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-peer-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-peer-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-peer-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-peer-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-peer-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "router-peer-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-  router             = google_compute_router.foobar.name
-}
-
-resource "google_compute_router_interface" "foobar" {
-  name       = "router-peer-test-%s"
-  router     = google_compute_router.foobar.name
-  region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
-  vpn_tunnel = google_compute_vpn_tunnel.foobar.name
-}
-
-resource "google_compute_router_peer" "foobar" {
-  name                      = "router-peer-test-%s"
-  router                    = google_compute_router.foobar.name
-  region                    = google_compute_router.foobar.region
-  peer_ip_address           = "169.254.3.2"
-  peer_asn                  = 65515
-  advertised_route_priority = 100
-  interface                 = google_compute_router_interface.foobar.name
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
+	        resource "google_compute_network" "foobar" {
+			name = "router-peer-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-peer-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-peer-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-peer-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-peer-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-peer-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_vpn_tunnel" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+			target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+			shared_secret = "unguessable"
+			peer_ip = "8.8.8.8"
+			router = "${google_compute_router.foobar.name}"
+		}
+		resource "google_compute_router_interface" "foobar" {
+			name = "router-peer-test-%s"
+			router = "${google_compute_router.foobar.name}"
+			region = "${google_compute_router.foobar.region}"
+			ip_range = "169.254.3.1/30"
+			vpn_tunnel = "${google_compute_vpn_tunnel.foobar.name}"
+		}
+		resource "google_compute_router_peer" "foobar" {
+			name = "router-peer-test-%s"
+			router = "${google_compute_router.foobar.name}"
+			region = "${google_compute_router.foobar.region}"
+			peer_ip_address = "169.254.3.2"
+			peer_asn = 65515
+			advertised_route_priority = 100
+			interface = "${google_compute_router_interface.foobar.name}"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
 }
 
 func testAccComputeRouterPeerKeepRouter(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-peer-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-peer-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-peer-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-peer-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-peer-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-peer-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-peer-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-peer-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "router-peer-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-  router             = google_compute_router.foobar.name
-}
-
-resource "google_compute_router_interface" "foobar" {
-  name       = "router-peer-test-%s"
-  router     = google_compute_router.foobar.name
-  region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
-  vpn_tunnel = google_compute_vpn_tunnel.foobar.name
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-peer-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-peer-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-peer-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-peer-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-peer-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-peer-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_vpn_tunnel" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+			target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+			shared_secret = "unguessable"
+			peer_ip = "8.8.8.8"
+			router = "${google_compute_router.foobar.name}"
+		}
+		resource "google_compute_router_interface" "foobar" {
+			name = "router-peer-test-%s"
+			router = "${google_compute_router.foobar.name}"
+			region = "${google_compute_router.foobar.region}"
+			ip_range = "169.254.3.1/30"
+			vpn_tunnel = "${google_compute_vpn_tunnel.foobar.name}"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
 }
 
 func testAccComputeRouterPeerAdvertiseMode(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name = "router-peer-test-%s"
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-peer-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "router-peer-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "router-peer-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "router-peer-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "router-peer-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "router-peer-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-peer-test-%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "router-peer-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-  router             = google_compute_router.foobar.name
-}
-
-resource "google_compute_router_interface" "foobar" {
-  name       = "router-peer-test-%s"
-  router     = google_compute_router.foobar.name
-  region     = google_compute_router.foobar.region
-  ip_range   = "169.254.3.1/30"
-  vpn_tunnel = google_compute_vpn_tunnel.foobar.name
-}
-
-resource "google_compute_router_peer" "foobar" {
-  name                      = "router-peer-test-%s"
-  router                    = google_compute_router.foobar.name
-  region                    = google_compute_router.foobar.region
-  peer_ip_address           = "169.254.3.2"
-  peer_asn                  = 65515
-  advertised_route_priority = 100
-  advertise_mode            = "CUSTOM"
-  advertised_groups         = ["ALL_SUBNETS"]
-  advertised_ip_ranges {
-    range = "10.1.0.0/32"
-  }
-  interface = google_compute_router_interface.foobar.name
-}
-`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
+	        resource "google_compute_network" "foobar" {
+			name = "router-peer-test-%s"
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-peer-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "router-peer-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "router-peer-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "router-peer-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "router-peer-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_vpn_tunnel" "foobar" {
+			name = "router-peer-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+			target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+			shared_secret = "unguessable"
+			peer_ip = "8.8.8.8"
+			router = "${google_compute_router.foobar.name}"
+		}
+		resource "google_compute_router_interface" "foobar" {
+			name = "router-peer-test-%s"
+			router = "${google_compute_router.foobar.name}"
+			region = "${google_compute_router.foobar.region}"
+			ip_range = "169.254.3.1/30"
+			vpn_tunnel = "${google_compute_vpn_tunnel.foobar.name}"
+		}
+		resource "google_compute_router_peer" "foobar" {
+			name = "router-peer-test-%s"
+			router = "${google_compute_router.foobar.name}"
+			region = "${google_compute_router.foobar.region}"
+			peer_ip_address = "169.254.3.2"
+			peer_asn = 65515
+			advertised_route_priority = 100
+			advertise_mode = "CUSTOM"
+			advertised_groups = ["ALL_SUBNETS"]
+			advertised_ip_ranges {
+				range = "10.1.0.0/32"
+			}
+			interface = "${google_compute_router_interface.foobar.name}"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId, testId)
 }
diff --git a/google/resource_compute_router_test.go b/google/resource_compute_router_test.go
index a15c89f73b6..2a753fb9677 100644
--- a/google/resource_compute_router_test.go
+++ b/google/resource_compute_router_test.go
@@ -151,96 +151,90 @@ func TestAccComputeRouter_updateAddRemoveBGP(t *testing.T) {
 
 func testAccComputeRouterBasic(testId, resourceRegion string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "router-test-%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "%s"
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.name
-  bgp {
-    asn = 64514
-  }
-}
-`, testId, testId, resourceRegion, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-test-%s"
+			auto_create_subnetworks = false
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "%s"
+		}
+		resource "google_compute_router" "foobar" {
+			name = "router-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+			network = "${google_compute_network.foobar.name}"
+			bgp {
+				asn = 64514
+			}
+		}
+	`, testId, testId, resourceRegion, testId)
 }
 
 func testAccComputeRouterNoRegion(testId, providerRegion string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "router-test-%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "%s"
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-test-%s"
-  network = google_compute_network.foobar.name
-  bgp {
-    asn = 64514
-  }
-}
-`, testId, testId, providerRegion, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-test-%s"
+			auto_create_subnetworks = false
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "%s"
+		}
+		resource "google_compute_router" "foobar" {
+			name = "router-test-%s"
+			network = "${google_compute_network.foobar.name}"
+			bgp {
+				asn = 64514
+			}
+		}
+	`, testId, testId, providerRegion, testId)
 }
 
 func testAccComputeRouterFull(testId string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "router-test-%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-test-%s"
-  network = google_compute_network.foobar.name
-  bgp {
-    asn               = 64514
-    advertise_mode    = "CUSTOM"
-    advertised_groups = ["ALL_SUBNETS"]
-    advertised_ip_ranges {
-      range = "1.2.3.4"
-    }
-    advertised_ip_ranges {
-      range = "6.7.0.0/16"
-    }
-  }
-}
-`, testId, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-test-%s"
+			auto_create_subnetworks = false
+		}
+
+		resource "google_compute_router" "foobar" {
+			name = "router-test-%s"
+			network = "${google_compute_network.foobar.name}"
+			bgp {
+				asn = 64514
+				advertise_mode = "CUSTOM"
+				advertised_groups = ["ALL_SUBNETS"]
+				advertised_ip_ranges {
+					range = "1.2.3.4"
+				}
+				advertised_ip_ranges {
+					range = "6.7.0.0/16"
+				}
+			}
+		}
+	`, testId, testId)
 }
 
 func testAccComputeRouter_noBGP(testId, resourceRegion string) string {
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "router-test-%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "router-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "%s"
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "router-test-%s"
-  region  = google_compute_subnetwork.foobar.region
-  network = google_compute_network.foobar.name
-}
-`, testId, testId, resourceRegion, testId)
+		resource "google_compute_network" "foobar" {
+			name = "router-test-%s"
+			auto_create_subnetworks = false
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "router-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "%s"
+		}
+		resource "google_compute_router" "foobar" {
+			name = "router-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+			network = "${google_compute_network.foobar.name}"
+		}
+	`, testId, testId, resourceRegion, testId)
 }
diff --git a/google/resource_compute_security_policy_test.go b/google/resource_compute_security_policy_test.go
index f99136796d8..69700ee37b4 100644
--- a/google/resource_compute_security_policy_test.go
+++ b/google/resource_compute_security_policy_test.go
@@ -115,8 +115,8 @@ func testAccCheckComputeSecurityPolicyDestroy(s *terraform.State) error {
 func testAccComputeSecurityPolicy_basic(spName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_security_policy" "policy" {
-  name        = "%s"
-  description = "basic security policy"
+	name        = "%s"
+	description = "basic security policy"
 }
 `, spName)
 }
@@ -124,31 +124,31 @@ resource "google_compute_security_policy" "policy" {
 func testAccComputeSecurityPolicy_withRule(spName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_security_policy" "policy" {
-  name = "%s"
-
-  rule {
-    action   = "allow"
-    priority = "2147483647"
-    match {
-      versioned_expr = "SRC_IPS_V1"
-      config {
-        src_ip_ranges = ["*"]
-      }
-    }
-    description = "default rule"
-  }
-
-  rule {
-    action   = "allow"
-    priority = "2000"
-    match {
-      versioned_expr = "SRC_IPS_V1"
-      config {
-        src_ip_ranges = ["10.0.0.0/24"]
-      }
-    }
-    preview = true
-  }
+	name = "%s"
+
+	rule {
+		action   = "allow"
+		priority = "2147483647"
+		match {
+			versioned_expr = "SRC_IPS_V1"
+			config {
+				src_ip_ranges = ["*"]
+			}
+		}
+		description = "default rule"
+	}
+
+	rule {
+		action   = "allow"
+		priority = "2000"
+		match {
+			versioned_expr = "SRC_IPS_V1"
+			config {
+				src_ip_ranges = ["10.0.0.0/24"]
+			}
+		}
+		preview = true
+	}
 }
 `, spName)
 }
@@ -156,47 +156,47 @@ resource "google_compute_security_policy" "policy" {
 func testAccComputeSecurityPolicy_update(spName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_security_policy" "policy" {
-  name        = "%s"
-  description = "updated description"
-
-  // keep this
-  rule {
-    action   = "allow"
-    priority = "2147483647"
-    match {
-      versioned_expr = "SRC_IPS_V1"
-      config {
-        src_ip_ranges = ["*"]
-      }
-    }
-    description = "default rule"
-  }
-
-  // add this
-  rule {
-    action   = "deny(403)"
-    priority = "1000"
-    match {
-      versioned_expr = "SRC_IPS_V1"
-      config {
-        src_ip_ranges = ["10.0.1.0/24"]
-      }
-    }
-  }
-
-  // update this
-  rule {
-    action   = "allow"
-    priority = "2000"
-    match {
-      versioned_expr = "SRC_IPS_V1"
-      config {
-        src_ip_ranges = ["10.0.0.0/24"]
-      }
-    }
-    description = "updated description"
-    preview     = false
-  }
+	name        = "%s"
+	description = "updated description"
+
+	// keep this
+	rule {
+		action   = "allow"
+		priority = "2147483647"
+		match {
+			versioned_expr = "SRC_IPS_V1"
+			config {
+				src_ip_ranges = ["*"]
+			}
+		}
+		description = "default rule"
+	}
+
+	// add this
+	rule {
+		action   = "deny(403)"
+		priority = "1000"
+		match {
+			versioned_expr = "SRC_IPS_V1"
+			config {
+				src_ip_ranges = ["10.0.1.0/24"]
+			}
+		}
+	}
+
+	// update this
+	rule {
+		action   = "allow"
+		priority = "2000"
+		match {
+			versioned_expr = "SRC_IPS_V1"
+			config {
+				src_ip_ranges = ["10.0.0.0/24"]
+			}
+		}
+		description = "updated description"
+		preview     = false
+	}
 }
 `, spName)
 }
diff --git a/google/resource_compute_shared_vpc_test.go b/google/resource_compute_shared_vpc_test.go
index 3a3861845c7..ae148ec7db9 100644
--- a/google/resource_compute_shared_vpc_test.go
+++ b/google/resource_compute_shared_vpc_test.go
@@ -96,69 +96,65 @@ func testAccCheckComputeSharedVpcServiceProject(hostProject, serviceProject stri
 func testAccComputeSharedVpc_basic(hostProject, serviceProject, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "host" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	project_id      = "%s"
+	name            = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project" "service" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	project_id      = "%s"
+	name            = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "host" {
-  project = google_project.host.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.host.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_project_service" "service" {
-  project = google_project.service.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.service.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_compute_shared_vpc_host_project" "host" {
-  project    = google_project.host.project_id
-  depends_on = [google_project_service.host]
+	project    = "${google_project.host.project_id}"
+	depends_on = ["google_project_service.host"]
 }
 
 resource "google_compute_shared_vpc_service_project" "service" {
-  host_project    = google_project.host.project_id
-  service_project = google_project.service.project_id
-  depends_on = [
-    google_compute_shared_vpc_host_project.host,
-    google_project_service.service,
-  ]
-}
-`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
+	host_project    = "${google_project.host.project_id}"
+	service_project = "${google_project.service.project_id}"
+	depends_on      = ["google_compute_shared_vpc_host_project.host", "google_project_service.service"]
+}`, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
 }
 
 func testAccComputeSharedVpc_disabled(hostProject, serviceProject, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "host" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	project_id      = "%s"
+	name            = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project" "service" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	project_id      = "%s"
+	name            = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "host" {
-  project = google_project.host.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.host.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_project_service" "service" {
-  project = google_project.service.project_id
-  service = "compute.googleapis.com"
+	project  = "${google_project.service.project_id}"
+	service = "compute.googleapis.com"
 }
 `, hostProject, hostProject, org, billing, serviceProject, serviceProject, org, billing)
 }
diff --git a/google/resource_compute_snapshot_test.go b/google/resource_compute_snapshot_test.go
index e1bd6444d2f..6cdf8164d78 100644
--- a/google/resource_compute_snapshot_test.go
+++ b/google/resource_compute_snapshot_test.go
@@ -35,32 +35,31 @@ func TestAccComputeSnapshot_encryption(t *testing.T) {
 func testAccComputeSnapshot_encryption(snapshotName string, diskName string) string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_disk" "foobar" {
-  name  = "%s"
-  image = data.google_compute_image.my_image.self_link
-  size  = 10
-  type  = "pd-ssd"
-  zone  = "us-central1-a"
-  disk_encryption_key {
-    raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
-  }
+	name = "%s"
+	image = "${data.google_compute_image.my_image.self_link}"
+	size = 10
+	type = "pd-ssd"
+	zone = "us-central1-a"
+	disk_encryption_key {
+		raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
+	}
 }
 
 resource "google_compute_snapshot" "foobar" {
-  name        = "%s"
-  source_disk = google_compute_disk.foobar.name
-  zone        = "us-central1-a"
-  snapshot_encryption_key {
-    raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
-  }
+	name = "%s"
+	source_disk = "${google_compute_disk.foobar.name}"
+	zone = "us-central1-a"
+	snapshot_encryption_key {
+		raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
+	}
 
-  source_disk_encryption_key {
-    raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
-  }
-}
-`, diskName, snapshotName)
+	source_disk_encryption_key {
+		raw_key = "SGVsbG8gZnJvbSBHb29nbGUgQ2xvdWQgUGxhdGZvcm0="
+	}
+}`, diskName, snapshotName)
 }
diff --git a/google/resource_compute_ssl_certificate_test.go b/google/resource_compute_ssl_certificate_test.go
index 5d6b981b5b7..4970fef84f1 100644
--- a/google/resource_compute_ssl_certificate_test.go
+++ b/google/resource_compute_ssl_certificate_test.go
@@ -65,9 +65,9 @@ func testAccCheckComputeSslCertificateExists(n string) resource.TestCheckFunc {
 func testAccComputeSslCertificate_no_name() string {
 	return fmt.Sprintf(`
 resource "google_compute_ssl_certificate" "foobar" {
-  description = "really descriptive"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	description = "really descriptive"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 `)
 }
diff --git a/google/resource_compute_ssl_policy_test.go b/google/resource_compute_ssl_policy_test.go
index dee4fabfdd0..b63b1e57fc7 100644
--- a/google/resource_compute_ssl_policy_test.go
+++ b/google/resource_compute_ssl_policy_test.go
@@ -190,10 +190,10 @@ func testAccCheckComputeSslPolicyExists(n string, sslPolicy *compute.SslPolicy)
 func testAccComputeSslUpdate1(resourceName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_ssl_policy" "update" {
-  name            = "%s"
-  description     = "Generated by TF provider acceptance test"
-  min_tls_version = "TLS_1_0"
-  profile         = "MODERN"
+	name = "%s"
+	description = "Generated by TF provider acceptance test"
+	min_tls_version = "TLS_1_0"
+	profile = "MODERN"
 }
 `, resourceName)
 }
@@ -201,10 +201,10 @@ resource "google_compute_ssl_policy" "update" {
 func testAccComputeSslUpdate2(resourceName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_ssl_policy" "update" {
-  name            = "%s"
-  description     = "Generated by TF provider acceptance test"
-  min_tls_version = "TLS_1_2"
-  profile         = "RESTRICTED"
+	name = "%s"
+	description = "Generated by TF provider acceptance test"
+	min_tls_version = "TLS_1_2"
+	profile = "RESTRICTED"
 }
 `, resourceName)
 }
@@ -212,11 +212,11 @@ resource "google_compute_ssl_policy" "update" {
 func testAccComputeSslUpdate3(resourceName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_ssl_policy" "update" {
-  name            = "%s"
-  description     = "Generated by TF provider acceptance test"
-  min_tls_version = "TLS_1_1"
-  profile         = "CUSTOM"
-  custom_features = ["TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"]
+	name = "%s"
+	description = "Generated by TF provider acceptance test"
+	min_tls_version = "TLS_1_1"
+	profile = "CUSTOM"
+	custom_features = ["TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"]
 }
 `, resourceName)
 }
diff --git a/google/resource_compute_subnetwork_iam_test.go b/google/resource_compute_subnetwork_iam_test.go
index 1f3f49ff0ce..973f39016de 100644
--- a/google/resource_compute_subnetwork_iam_test.go
+++ b/google/resource_compute_subnetwork_iam_test.go
@@ -63,30 +63,30 @@ resource "google_service_account" "test_account" {
 }
 
 resource "google_compute_network" "network" {
-  name                    = "%s"
+  name = "%s"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "subnetwork" {
-  name          = "%s"
-  region        = "%s"
+  name = "%s"
+  region = "%s"
   ip_cidr_range = "10.1.0.0/16"
-  network       = google_compute_network.network.name
+  network = "${google_compute_network.network.name}"
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role = "%s"
+	binding {
+		role = "%s"
 
-    members = ["serviceAccount:${google_service_account.test_account.email}"]
-  }
+		members = ["serviceAccount:${google_service_account.test_account.email}"]
+	}
 }
 
 resource "google_compute_subnetwork_iam_policy" "foo" {
-  project     = google_compute_subnetwork.subnetwork.project
-  region      = google_compute_subnetwork.subnetwork.region
-  subnetwork  = google_compute_subnetwork.subnetwork.name
-  policy_data = data.google_iam_policy.foo.policy_data
+  project     = "${google_compute_subnetwork.subnetwork.project}"
+  region      = "${google_compute_subnetwork.subnetwork.region}"
+  subnetwork  = "${google_compute_subnetwork.subnetwork.name}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, account, subnetworkName, subnetworkName, region, roleId)
 }
diff --git a/google/resource_compute_subnetwork_test.go b/google/resource_compute_subnetwork_test.go
index 8ef69140c62..bf86bacec48 100644
--- a/google/resource_compute_subnetwork_test.go
+++ b/google/resource_compute_subnetwork_test.go
@@ -369,30 +369,31 @@ func testAccCheckComputeSubnetworkHasNotSecondaryIpRange(subnetwork *compute.Sub
 func testAccComputeSubnetwork_basic(cnName, subnetwork1Name, subnetwork2Name, subnetwork3Name string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-ref-by-url" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
 }
 
+
 resource "google_compute_subnetwork" "network-ref-by-name" {
-  name          = "%s"
-  ip_cidr_range = "10.1.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.name
+	name = "%s"
+	ip_cidr_range = "10.1.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.name}"
 }
 
 resource "google_compute_subnetwork" "network-with-private-google-access" {
-  name                     = "%s"
-  ip_cidr_range            = "10.2.0.0/16"
-  region                   = "us-central1"
-  network                  = google_compute_network.custom-test.self_link
-  private_ip_google_access = true
+	name = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	private_ip_google_access = true
 }
 `, cnName, subnetwork1Name, subnetwork2Name, subnetwork3Name)
 }
@@ -400,16 +401,16 @@ resource "google_compute_subnetwork" "network-with-private-google-access" {
 func testAccComputeSubnetwork_update1(cnName, cidrRange, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-google-access" {
-  name                     = "%s"
-  ip_cidr_range            = "%s"
-  region                   = "us-central1"
-  network                  = google_compute_network.custom-test.self_link
-  private_ip_google_access = true
+	name = "%s"
+	ip_cidr_range = "%s"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	private_ip_google_access = true
 }
 `, cnName, subnetworkName, cidrRange)
 }
@@ -417,15 +418,15 @@ resource "google_compute_subnetwork" "network-with-private-google-access" {
 func testAccComputeSubnetwork_update2(cnName, cidrRange, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-google-access" {
-  name          = "%s"
-  ip_cidr_range = "%s"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
+	name = "%s"
+	ip_cidr_range = "%s"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
 }
 `, cnName, subnetworkName, cidrRange)
 }
@@ -433,20 +434,20 @@ resource "google_compute_subnetwork" "network-with-private-google-access" {
 func testAccComputeSubnetwork_update3(cnName, cidrRange, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-google-access" {
-  name          = "%s"
-  ip_cidr_range = "%s"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update"
-    ip_cidr_range = "192.168.10.0/24"
-  }
+	name = "%s"
+	ip_cidr_range = "%s"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+
+	secondary_ip_range {
+		range_name = "tf-test-secondary-range-update"
+		ip_cidr_range = "192.168.10.0/24"
+	}
 }
 `, cnName, subnetworkName, cidrRange)
 }
@@ -454,19 +455,19 @@ resource "google_compute_subnetwork" "network-with-private-google-access" {
 func testAccComputeSubnetwork_secondaryIpRanges_update1(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update1"
-    ip_cidr_range = "192.168.10.0/24"
-  }
+	name = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	secondary_ip_range {
+		range_name = "tf-test-secondary-range-update1"
+		ip_cidr_range = "192.168.10.0/24"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -474,23 +475,23 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
 func testAccComputeSubnetwork_secondaryIpRanges_update2(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update1"
-    ip_cidr_range = "192.168.10.0/24"
-  }
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update2"
-    ip_cidr_range = "192.168.11.0/24"
-  }
+	name = "%s"
+	ip_cidr_range = "10.2.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	secondary_ip_range {
+		range_name = "tf-test-secondary-range-update1"
+		ip_cidr_range = "192.168.10.0/24"
+	}
+	secondary_ip_range {
+		range_name = "tf-test-secondary-range-update2"
+		ip_cidr_range = "192.168.11.0/24"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -498,23 +499,23 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
 func testAccComputeSubnetwork_secondaryIpRanges_update3(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+       name = "%s"
+       auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" {
-  name          = "%s"
-  ip_cidr_range = "10.2.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update2"
-    ip_cidr_range = "192.168.11.0/24"
-  }
-  secondary_ip_range {
-    range_name    = "tf-test-secondary-range-update1"
-    ip_cidr_range = "192.168.10.0/24"
-  }
+       name = "%s"
+       ip_cidr_range = "10.2.0.0/16"
+       region = "us-central1"
+       network = "${google_compute_network.custom-test.self_link}"
+       secondary_ip_range {
+               range_name = "tf-test-secondary-range-update2"
+               ip_cidr_range = "192.168.11.0/24"
+       }
+       secondary_ip_range {
+               range_name = "tf-test-secondary-range-update1"
+               ip_cidr_range = "192.168.10.0/24"
+       }
 }
 `, cnName, subnetworkName)
 }
@@ -522,16 +523,16 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
 func testAccComputeSubnetwork_secondaryIpRanges_update4(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+       name = "%s"
+       auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges" {
-  name               = "%s"
-  ip_cidr_range      = "10.2.0.0/16"
-  region             = "us-central1"
-  network            = google_compute_network.custom-test.self_link
-  secondary_ip_range = []
+       name = "%s"
+       ip_cidr_range = "10.2.0.0/16"
+       region = "us-central1"
+       network = "${google_compute_network.custom-test.self_link}"
+       secondary_ip_range = []
 }
 `, cnName, subnetworkName)
 }
@@ -539,20 +540,20 @@ resource "google_compute_subnetwork" "network-with-private-secondary-ip-ranges"
 func testAccComputeSubnetwork_flowLogs(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  log_config {
-    aggregation_interval = "INTERVAL_5_SEC"
-    flow_sampling        = 0.5
-    metadata             = "INCLUDE_ALL_METADATA"
-  }
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	log_config {
+		aggregation_interval = "INTERVAL_5_SEC"
+		flow_sampling        = 0.5
+		metadata             = "INCLUDE_ALL_METADATA"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -560,20 +561,20 @@ resource "google_compute_subnetwork" "network-with-flow-logs" {
 func testAccComputeSubnetwork_flowLogsUpdate(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  log_config {
-    aggregation_interval = "INTERVAL_30_SEC"
-    flow_sampling        = 0.8
-    metadata             = "EXCLUDE_ALL_METADATA"
-  }
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	log_config {
+		aggregation_interval = "INTERVAL_30_SEC"
+		flow_sampling        = 0.8
+		metadata             = "EXCLUDE_ALL_METADATA"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -581,15 +582,15 @@ resource "google_compute_subnetwork" "network-with-flow-logs" {
 func testAccComputeSubnetwork_flowLogsDelete(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
 }
 `, cnName, subnetworkName)
 }
@@ -597,20 +598,20 @@ resource "google_compute_subnetwork" "network-with-flow-logs" {
 func testAccComputeSubnetwork_flowLogsMigrate(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  log_config {
-    aggregation_interval = "INTERVAL_30_SEC"
-    flow_sampling        = 0.6
-    metadata             = "INCLUDE_ALL_METADATA"
-  }
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	log_config {
+		aggregation_interval = "INTERVAL_30_SEC"
+		flow_sampling        = 0.6
+		metadata             = "INCLUDE_ALL_METADATA"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -618,20 +619,20 @@ resource "google_compute_subnetwork" "network-with-flow-logs" {
 func testAccComputeSubnetwork_flowLogsMigrate2(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  log_config {
-    aggregation_interval = "INTERVAL_30_SEC"
-    flow_sampling        = 0.7
-    metadata             = "INCLUDE_ALL_METADATA"
-  }
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	log_config {
+		aggregation_interval = "INTERVAL_30_SEC"
+		flow_sampling        = 0.7
+		metadata             = "INCLUDE_ALL_METADATA"
+	}
 }
 `, cnName, subnetworkName)
 }
@@ -639,20 +640,20 @@ resource "google_compute_subnetwork" "network-with-flow-logs" {
 func testAccComputeSubnetwork_flowLogsMigrate3(cnName, subnetworkName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "custom-test" {
-  name                    = "%s"
-  auto_create_subnetworks = false
+	name = "%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "network-with-flow-logs" {
-  name          = "%s"
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-  network       = google_compute_network.custom-test.self_link
-  log_config {
-    aggregation_interval = "INTERVAL_30_SEC"
-    flow_sampling        = 0.8
-    metadata             = "INCLUDE_ALL_METADATA"
-  }
+	name = "%s"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "us-central1"
+	network = "${google_compute_network.custom-test.self_link}"
+	log_config {
+		aggregation_interval = "INTERVAL_30_SEC"
+		flow_sampling        = 0.8
+		metadata             = "INCLUDE_ALL_METADATA"
+	}
 }
 `, cnName, subnetworkName)
 }
diff --git a/google/resource_compute_target_http_proxy_test.go b/google/resource_compute_target_http_proxy_test.go
index f6d9132af03..e8be2e57a0e 100644
--- a/google/resource_compute_target_http_proxy_test.go
+++ b/google/resource_compute_target_http_proxy_test.go
@@ -72,132 +72,132 @@ func testAccCheckComputeTargetHttpProxyExists(n string) resource.TestCheckFunc {
 
 func testAccComputeTargetHttpProxy_basic1(target, backend, hc, urlmap1, urlmap2 string) string {
 	return fmt.Sprintf(`
-resource "google_compute_target_http_proxy" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  url_map     = google_compute_url_map.foobar1.self_link
-}
+	resource "google_compute_target_http_proxy" "foobar" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		url_map = "${google_compute_url_map.foobar1.self_link}"
+	}
 
-resource "google_compute_backend_service" "foobar" {
-  name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
-}
+	resource "google_compute_backend_service" "foobar" {
+		name = "%s"
+		health_checks = ["${google_compute_http_health_check.zero.self_link}"]
+	}
 
-resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
-}
+	resource "google_compute_http_health_check" "zero" {
+		name = "%s"
+		request_path = "/"
+		check_interval_sec = 1
+		timeout_sec = 1
+	}
 
-resource "google_compute_url_map" "foobar1" {
-  name            = "%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
-}
+	resource "google_compute_url_map" "foobar1" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.foobar.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.foobar.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
 
-resource "google_compute_url_map" "foobar2" {
-  name            = "%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
-}
-`, target, backend, hc, urlmap1, urlmap2)
+	resource "google_compute_url_map" "foobar2" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.foobar.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.foobar.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+	`, target, backend, hc, urlmap1, urlmap2)
 }
 
 func testAccComputeTargetHttpProxy_basic2(target, backend, hc, urlmap1, urlmap2 string) string {
 	return fmt.Sprintf(`
-resource "google_compute_target_http_proxy" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "%s"
-  url_map     = google_compute_url_map.foobar2.self_link
-}
+	resource "google_compute_target_http_proxy" "foobar" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		url_map = "${google_compute_url_map.foobar2.self_link}"
+	}
 
-resource "google_compute_backend_service" "foobar" {
-  name          = "%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
-}
+	resource "google_compute_backend_service" "foobar" {
+		name = "%s"
+		health_checks = ["${google_compute_http_health_check.zero.self_link}"]
+	}
 
-resource "google_compute_http_health_check" "zero" {
-  name               = "%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
-}
+	resource "google_compute_http_health_check" "zero" {
+		name = "%s"
+		request_path = "/"
+		check_interval_sec = 1
+		timeout_sec = 1
+	}
 
-resource "google_compute_url_map" "foobar1" {
-  name            = "%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
-}
+	resource "google_compute_url_map" "foobar1" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.foobar.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.foobar.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
 
-resource "google_compute_url_map" "foobar2" {
-  name            = "%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
-}
-`, target, backend, hc, urlmap1, urlmap2)
+	resource "google_compute_url_map" "foobar2" {
+		name = "%s"
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		host_rule {
+			hosts = ["mysite.com", "myothersite.com"]
+			path_matcher = "boop"
+		}
+		path_matcher {
+			default_service = "${google_compute_backend_service.foobar.self_link}"
+			name = "boop"
+			path_rule {
+				paths = ["/*"]
+				service = "${google_compute_backend_service.foobar.self_link}"
+			}
+		}
+		test {
+			host = "mysite.com"
+			path = "/*"
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+	`, target, backend, hc, urlmap1, urlmap2)
 }
diff --git a/google/resource_compute_target_https_proxy_test.go b/google/resource_compute_target_https_proxy_test.go
index 16790de8f72..250645783f9 100644
--- a/google/resource_compute_target_https_proxy_test.go
+++ b/google/resource_compute_target_https_proxy_test.go
@@ -106,66 +106,66 @@ func testAccComputeTargetHttpsProxyHasSslCertificate(cert string, proxy *compute
 func testAccComputeTargetHttpsProxy_basic1(id string) string {
 	return fmt.Sprintf(`
 resource "google_compute_target_https_proxy" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "httpsproxy-test-%s"
-  url_map          = google_compute_url_map.foobar.self_link
-  ssl_certificates = [google_compute_ssl_certificate.foobar1.self_link]
-  ssl_policy       = google_compute_ssl_policy.foobar.self_link
+	description = "Resource created for Terraform acceptance testing"
+	name = "httpsproxy-test-%s"
+	url_map = "${google_compute_url_map.foobar.self_link}"
+	ssl_certificates = ["${google_compute_ssl_certificate.foobar1.self_link}"]
+	ssl_policy = "${google_compute_ssl_policy.foobar.self_link}"
 }
 
 resource "google_compute_backend_service" "foobar" {
-  name          = "httpsproxy-test-backend-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name = "httpsproxy-test-backend-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "httpsproxy-test-health-check-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name = "httpsproxy-test-health-check-%s"
+	request_path = "/"
+	check_interval_sec = 1
+	timeout_sec = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "httpsproxy-test-url-map-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
+	name = "httpsproxy-test-url-map-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+	host_rule {
+		hosts = ["mysite.com", "myothersite.com"]
+		path_matcher = "boop"
+	}
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name = "boop"
+		path_rule {
+			paths = ["/*"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+	test {
+		host = "mysite.com"
+		path = "/*"
+		service = "${google_compute_backend_service.foobar.self_link}"
+	}
 }
 
 resource "google_compute_ssl_policy" "foobar" {
-  name            = "sslproxy-test-%s"
-  description     = "my-description"
-  min_tls_version = "TLS_1_2"
-  profile         = "MODERN"
+	name            = "sslproxy-test-%s"
+	description     = "my-description"
+	min_tls_version = "TLS_1_2"
+	profile         = "MODERN"
 }
 
 resource "google_compute_ssl_certificate" "foobar1" {
-  name        = "httpsproxy-test-cert1-%s"
-  description = "very descriptive"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "httpsproxy-test-cert1-%s"
+	description = "very descriptive"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 
 resource "google_compute_ssl_certificate" "foobar2" {
-  name        = "httpsproxy-test-cert2-%s"
-  description = "very descriptive"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "httpsproxy-test-cert2-%s"
+	description = "very descriptive"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 `, id, id, id, id, id, id, id)
 }
@@ -173,69 +173,69 @@ resource "google_compute_ssl_certificate" "foobar2" {
 func testAccComputeTargetHttpsProxy_basic2(id string) string {
 	return fmt.Sprintf(`
 resource "google_compute_target_https_proxy" "foobar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "httpsproxy-test-%s"
-  url_map     = google_compute_url_map.foobar.self_link
-  ssl_certificates = [
-    google_compute_ssl_certificate.foobar1.self_link,
-    google_compute_ssl_certificate.foobar2.self_link,
-  ]
-  quic_override = "ENABLE"
+	description = "Resource created for Terraform acceptance testing"
+	name = "httpsproxy-test-%s"
+	url_map = "${google_compute_url_map.foobar.self_link}"
+	ssl_certificates = [
+		"${google_compute_ssl_certificate.foobar1.self_link}",
+		"${google_compute_ssl_certificate.foobar2.self_link}",
+	]
+	quic_override = "ENABLE"
 }
 
 resource "google_compute_backend_service" "foobar" {
-  name          = "httpsproxy-test-backend-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name = "httpsproxy-test-backend-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "httpsproxy-test-health-check-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name = "httpsproxy-test-health-check-%s"
+	request_path = "/"
+	check_interval_sec = 1
+	timeout_sec = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "httpsproxy-test-url-map-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
+	name = "httpsproxy-test-url-map-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+	host_rule {
+		hosts = ["mysite.com", "myothersite.com"]
+		path_matcher = "boop"
+	}
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name = "boop"
+		path_rule {
+			paths = ["/*"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+	test {
+		host = "mysite.com"
+		path = "/*"
+		service = "${google_compute_backend_service.foobar.self_link}"
+	}
 }
 
 resource "google_compute_ssl_policy" "foobar" {
-  name            = "sslproxy-test-%s"
-  description     = "my-description"
-  min_tls_version = "TLS_1_2"
-  profile         = "MODERN"
+	name            = "sslproxy-test-%s"
+	description     = "my-description"
+	min_tls_version = "TLS_1_2"
+	profile         = "MODERN"
 }
 
 resource "google_compute_ssl_certificate" "foobar1" {
-  name        = "httpsproxy-test-cert1-%s"
-  description = "very descriptive"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "httpsproxy-test-cert1-%s"
+	description = "very descriptive"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 
 resource "google_compute_ssl_certificate" "foobar2" {
-  name        = "httpsproxy-test-cert2-%s"
-  description = "very descriptive"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "httpsproxy-test-cert2-%s"
+	description = "very descriptive"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 `, id, id, id, id, id, id, id)
 }
diff --git a/google/resource_compute_target_pool_test.go b/google/resource_compute_target_pool_test.go
index a33b2792c2b..7a0eafd2e14 100644
--- a/google/resource_compute_target_pool_test.go
+++ b/google/resource_compute_target_pool_test.go
@@ -61,7 +61,7 @@ func TestAccComputeTargetPool_update(t *testing.T) {
 			{
 				// Add the two instances to the pool
 				Config: testAccComputeTargetPool_update(tpname,
-					`google_compute_instance.foo.self_link, google_compute_instance.bar.self_link`,
+					`"${google_compute_instance.foo.self_link}", "${google_compute_instance.bar.self_link}"`,
 					name1, name2),
 			},
 			{
@@ -72,7 +72,7 @@ func TestAccComputeTargetPool_update(t *testing.T) {
 			{
 				// Reversing the order of instances or changing import format shouldn't matter
 				Config: testAccComputeTargetPool_update(tpname,
-					fmt.Sprintf(`google_compute_instance.bar.self_link, "us-central1-a/%s"`, name1),
+					fmt.Sprintf(`"${google_compute_instance.bar.self_link}", "us-central1-a/%s"`, name1),
 					name1, name2),
 				PlanOnly: true,
 			},
@@ -149,63 +149,62 @@ func testAccCheckComputeTargetPoolHealthCheck(targetPool, healthCheck string) re
 func testAccComputeTargetPool_basic() string {
 	return fmt.Sprintf(`
 data "google_compute_image" "my_image" {
-  family  = "debian-9"
-  project = "debian-cloud"
+	family  = "debian-9"
+	project = "debian-cloud"
 }
 
 resource "google_compute_http_health_check" "foobar" {
-  name = "healthcheck-test-%s"
-  host = "example.com"
+	name = "healthcheck-test-%s"
+	host = "example.com"
 }
 
 resource "google_compute_instance" "foobar" {
-  name         = "inst-tp-test-%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "inst-tp-test-%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
-  boot_disk {
-    initialize_params {
-      image = data.google_compute_image.my_image.self_link
-    }
-  }
+	boot_disk {
+		initialize_params{
+			image = "${data.google_compute_image.my_image.self_link}"
+		}
+	}
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_target_pool" "foo" {
-  description      = "Resource created for Terraform acceptance testing"
-  instances        = [google_compute_instance.foobar.self_link, "us-central1-b/bar"]
-  name             = "tpool-test-%s"
-  session_affinity = "CLIENT_IP_PROTO"
-  health_checks = [
-    google_compute_http_health_check.foobar.name,
-  ]
+	description = "Resource created for Terraform acceptance testing"
+	instances = ["${google_compute_instance.foobar.self_link}", "us-central1-b/bar"]
+	name = "tpool-test-%s"
+	session_affinity = "CLIENT_IP_PROTO"
+	health_checks = [
+		"${google_compute_http_health_check.foobar.name}"
+	]
 }
 
 resource "google_compute_target_pool" "bar" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "tpool-test-%s"
-  health_checks = [
-    google_compute_http_health_check.foobar.self_link,
-  ]
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
+	description = "Resource created for Terraform acceptance testing"
+	name = "tpool-test-%s"
+	health_checks = [
+		"${google_compute_http_health_check.foobar.self_link}"
+	]
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccComputeTargetPool_update(tpname, instances, name1, name2 string) string {
 	return fmt.Sprintf(`
 resource "google_compute_target_pool" "foo" {
-  description = "Resource created for Terraform acceptance testing"
-  name        = "tpool-test-%s"
-  instances   = [%s]
+	description = "Resource created for Terraform acceptance testing"
+	name = "tpool-test-%s"
+	instances = [%s]
 }
 
 resource "google_compute_instance" "foo" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
   boot_disk {
     initialize_params {
@@ -213,15 +212,15 @@ resource "google_compute_instance" "foo" {
     }
   }
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 
 resource "google_compute_instance" "bar" {
-  name         = "%s"
-  machine_type = "n1-standard-1"
-  zone         = "us-central1-a"
+	name         = "%s"
+	machine_type = "n1-standard-1"
+	zone         = "us-central1-a"
 
   boot_disk {
     initialize_params {
@@ -229,9 +228,9 @@ resource "google_compute_instance" "bar" {
     }
   }
 
-  network_interface {
-    network = "default"
-  }
+	network_interface {
+		network = "default"
+	}
 }
 `, tpname, instances, name1, name2)
 }
diff --git a/google/resource_compute_target_ssl_proxy_test.go b/google/resource_compute_target_ssl_proxy_test.go
index 4a0d5762120..b2e8c5f5303 100644
--- a/google/resource_compute_target_ssl_proxy_test.go
+++ b/google/resource_compute_target_ssl_proxy_test.go
@@ -81,40 +81,40 @@ func testAccCheckComputeTargetSslProxy(n, proxyHeader, sslCert string) resource.
 func testAccComputeTargetSslProxy_basic1(target, sslPolicy, sslCert, backend, hc string) string {
 	return fmt.Sprintf(`
 resource "google_compute_target_ssl_proxy" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  backend_service  = google_compute_backend_service.foo.self_link
-  ssl_certificates = [google_compute_ssl_certificate.foo.self_link]
-  proxy_header     = "NONE"
-  ssl_policy       = google_compute_ssl_policy.foo.self_link
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	backend_service = "${google_compute_backend_service.foo.self_link}"
+	ssl_certificates = ["${google_compute_ssl_certificate.foo.self_link}"]
+	proxy_header = "NONE"
+	ssl_policy = "${google_compute_ssl_policy.foo.self_link}"
 }
 
 resource "google_compute_ssl_policy" "foo" {
-  name            = "%s"
-  description     = "Resource created for Terraform acceptance testing"
-  min_tls_version = "TLS_1_2"
-  profile         = "MODERN"
+	name            = "%s"
+	description     = "Resource created for Terraform acceptance testing"
+	min_tls_version = "TLS_1_2"
+	profile         = "MODERN"
 }
 
 resource "google_compute_ssl_certificate" "foo" {
-  name        = "%s"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "%s"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 
 resource "google_compute_backend_service" "foo" {
-  name          = "%s"
-  protocol      = "SSL"
-  health_checks = [google_compute_health_check.zero.self_link]
+	name = "%s"
+	protocol    = "SSL"
+	health_checks = ["${google_compute_health_check.zero.self_link}"]
 }
 
 resource "google_compute_health_check" "zero" {
-  name               = "%s"
-  check_interval_sec = 1
-  timeout_sec        = 1
-  tcp_health_check {
-    port = "443"
-  }
+	name = "%s"
+	check_interval_sec = 1
+	timeout_sec = 1
+	tcp_health_check {
+		port = "443"
+	}
 }
 `, target, sslPolicy, sslCert, backend, hc)
 }
@@ -122,51 +122,51 @@ resource "google_compute_health_check" "zero" {
 func testAccComputeTargetSslProxy_basic2(target, sslPolicy, sslCert1, sslCert2, backend1, backend2, hc string) string {
 	return fmt.Sprintf(`
 resource "google_compute_target_ssl_proxy" "foobar" {
-  description      = "Resource created for Terraform acceptance testing"
-  name             = "%s"
-  backend_service  = google_compute_backend_service.bar.self_link
-  ssl_certificates = [google_compute_ssl_certificate.bar.name]
-  proxy_header     = "PROXY_V1"
+	description = "Resource created for Terraform acceptance testing"
+	name = "%s"
+	backend_service = "${google_compute_backend_service.bar.self_link}"
+	ssl_certificates = ["${google_compute_ssl_certificate.bar.name}"]
+	proxy_header = "PROXY_V1"
 }
 
 resource "google_compute_ssl_policy" "foo" {
-  name            = "%s"
-  description     = "Resource created for Terraform acceptance testing"
-  min_tls_version = "TLS_1_2"
-  profile         = "MODERN"
+	name            = "%s"
+	description     = "Resource created for Terraform acceptance testing"
+	min_tls_version = "TLS_1_2"
+	profile         = "MODERN"
 }
 
 resource "google_compute_ssl_certificate" "foo" {
-  name        = "%s"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "%s"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 
 resource "google_compute_ssl_certificate" "bar" {
-  name        = "%s"
-  private_key = file("test-fixtures/ssl_cert/test.key")
-  certificate = file("test-fixtures/ssl_cert/test.crt")
+	name = "%s"
+	private_key = "${file("test-fixtures/ssl_cert/test.key")}"
+	certificate = "${file("test-fixtures/ssl_cert/test.crt")}"
 }
 
 resource "google_compute_backend_service" "foo" {
-  name          = "%s"
-  protocol      = "SSL"
-  health_checks = [google_compute_health_check.zero.self_link]
+	name = "%s"
+	protocol    = "SSL"
+	health_checks = ["${google_compute_health_check.zero.self_link}"]
 }
 
 resource "google_compute_backend_service" "bar" {
-  name          = "%s"
-  protocol      = "SSL"
-  health_checks = [google_compute_health_check.zero.self_link]
+	name = "%s"
+	protocol    = "SSL"
+	health_checks = ["${google_compute_health_check.zero.self_link}"]
 }
 
 resource "google_compute_health_check" "zero" {
-  name               = "%s"
-  check_interval_sec = 1
-  timeout_sec        = 1
-  tcp_health_check {
-    port = "443"
-  }
+	name = "%s"
+	check_interval_sec = 1
+	timeout_sec = 1
+	tcp_health_check {
+		port = "443"
+	}
 }
 `, target, sslPolicy, sslCert1, sslCert2, backend1, backend2, hc)
 }
diff --git a/google/resource_compute_target_tcp_proxy_test.go b/google/resource_compute_target_tcp_proxy_test.go
index 6536ae2c546..a9b744350ff 100644
--- a/google/resource_compute_target_tcp_proxy_test.go
+++ b/google/resource_compute_target_tcp_proxy_test.go
@@ -69,52 +69,52 @@ func testAccCheckComputeTargetTcpProxyExists(n string) resource.TestCheckFunc {
 
 func testAccComputeTargetTcpProxy_basic1(target, backend, hc string) string {
 	return fmt.Sprintf(`
-resource "google_compute_target_tcp_proxy" "foobar" {
-  description     = "Resource created for Terraform acceptance testing"
-  name            = "%s"
-  backend_service = google_compute_backend_service.foobar.self_link
-  proxy_header    = "NONE"
-}
+	resource "google_compute_target_tcp_proxy" "foobar" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		backend_service = "${google_compute_backend_service.foobar.self_link}"
+		proxy_header = "NONE"
+	}
 
-resource "google_compute_backend_service" "foobar" {
-  name          = "%s"
-  protocol      = "TCP"
-  health_checks = [google_compute_health_check.zero.self_link]
-}
+	resource "google_compute_backend_service" "foobar" {
+		name = "%s"
+		protocol    = "TCP"
+		health_checks = ["${google_compute_health_check.zero.self_link}"]
+	}
 
-resource "google_compute_health_check" "zero" {
-  name               = "%s"
-  check_interval_sec = 1
-  timeout_sec        = 1
-  tcp_health_check {
-    port = "443"
-  }
-}
-`, target, backend, hc)
+	resource "google_compute_health_check" "zero" {
+		name = "%s"
+		check_interval_sec = 1
+		timeout_sec = 1
+		tcp_health_check {
+			port = "443"
+		}
+	}
+	`, target, backend, hc)
 }
 
 func testAccComputeTargetTcpProxy_basic2(target, backend, hc string) string {
 	return fmt.Sprintf(`
-resource "google_compute_target_tcp_proxy" "foobar" {
-  description     = "Resource created for Terraform acceptance testing"
-  name            = "%s"
-  backend_service = google_compute_backend_service.foobar.self_link
-  proxy_header    = "PROXY_V1"
-}
+	resource "google_compute_target_tcp_proxy" "foobar" {
+		description = "Resource created for Terraform acceptance testing"
+		name = "%s"
+		backend_service = "${google_compute_backend_service.foobar.self_link}"
+		proxy_header = "PROXY_V1"
+	}
 
-resource "google_compute_backend_service" "foobar" {
-  name          = "%s"
-  protocol      = "TCP"
-  health_checks = [google_compute_health_check.zero.self_link]
-}
+	resource "google_compute_backend_service" "foobar" {
+		name = "%s"
+		protocol    = "TCP"
+		health_checks = ["${google_compute_health_check.zero.self_link}"]
+	}
 
-resource "google_compute_health_check" "zero" {
-  name               = "%s"
-  check_interval_sec = 1
-  timeout_sec        = 1
-  tcp_health_check {
-    port = "443"
-  }
-}
-`, target, backend, hc)
+	resource "google_compute_health_check" "zero" {
+		name = "%s"
+		check_interval_sec = 1
+		timeout_sec = 1
+		tcp_health_check {
+			port = "443"
+		}
+	}
+	`, target, backend, hc)
 }
diff --git a/google/resource_compute_url_map_test.go b/google/resource_compute_url_map_test.go
index 5b61c498d56..82e5d8b087e 100644
--- a/google/resource_compute_url_map_test.go
+++ b/google/resource_compute_url_map_test.go
@@ -125,41 +125,41 @@ func testAccCheckComputeUrlMapExists(n string) resource.TestCheckFunc {
 func testAccComputeUrlMap_basic1(bsName, hcName, umName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "urlmap-test-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name          = "urlmap-test-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "urlmap-test-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "urlmap-test-%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "urlmap-test-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-
-    path_rule {
-      paths   = ["/*"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
+	name            = "urlmap-test-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+
+	host_rule {
+		hosts        = ["mysite.com", "myothersite.com"]
+		path_matcher = "boop"
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "boop"
+
+		path_rule {
+			paths   = ["/*"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+
+	test {
+		host    = "mysite.com"
+		path    = "/*"
+		service = "${google_compute_backend_service.foobar.self_link}"
+	}
 }
 `, bsName, hcName, umName)
 }
@@ -167,41 +167,41 @@ resource "google_compute_url_map" "foobar" {
 func testAccComputeUrlMap_basic2(bsName, hcName, umName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "urlmap-test-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name          = "urlmap-test-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "urlmap-test-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "urlmap-test-%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "urlmap-test-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "blip"
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blip"
-
-    path_rule {
-      paths   = ["/*", "/home"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-
-  test {
-    host    = "mysite.com"
-    path    = "/test"
-    service = google_compute_backend_service.foobar.self_link
-  }
+	name            = "urlmap-test-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+
+	host_rule {
+		hosts        = ["mysite.com", "myothersite.com"]
+		path_matcher = "blip"
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blip"
+
+		path_rule {
+			paths   = ["/*", "/home"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+
+	test {
+		host    = "mysite.com"
+		path    = "/test"
+		service = "${google_compute_backend_service.foobar.self_link}"
+	}
 }
 `, bsName, hcName, umName)
 }
@@ -209,50 +209,50 @@ resource "google_compute_url_map" "foobar" {
 func testAccComputeUrlMap_advanced1() string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "urlmap-test-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name          = "urlmap-test-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "urlmap-test-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "urlmap-test-%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "urlmap-test-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "blop"
-  }
-
-  host_rule {
-    hosts        = ["myfavoritesite.com"]
-    path_matcher = "blip"
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blop"
-
-    path_rule {
-      paths   = ["/*", "/home"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blip"
-
-    path_rule {
-      paths   = ["/*", "/home"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
+	name            = "urlmap-test-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+
+	host_rule {
+		hosts        = ["mysite.com", "myothersite.com"]
+		path_matcher = "blop"
+	}
+
+	host_rule {
+		hosts        = ["myfavoritesite.com"]
+		path_matcher = "blip"
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blop"
+
+		path_rule {
+			paths   = ["/*", "/home"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blip"
+
+		path_rule {
+			paths   = ["/*", "/home"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
 }
 `, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
@@ -260,70 +260,70 @@ resource "google_compute_url_map" "foobar" {
 func testAccComputeUrlMap_advanced2() string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "urlmap-test-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name          = "urlmap-test-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "urlmap-test-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "urlmap-test-%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "urlmap-test-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "blep"
-  }
-
-  host_rule {
-    hosts        = ["myfavoritesite.com"]
-    path_matcher = "blip"
-  }
-
-  host_rule {
-    hosts        = ["myleastfavoritesite.com"]
-    path_matcher = "blub"
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blep"
-
-    path_rule {
-      paths   = ["/home"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-
-    path_rule {
-      paths   = ["/login"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blub"
-
-    path_rule {
-      paths   = ["/*", "/blub"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "blip"
-
-    path_rule {
-      paths   = ["/*", "/home"]
-      service = google_compute_backend_service.foobar.self_link
-    }
-  }
+	name            = "urlmap-test-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+
+	host_rule {
+		hosts        = ["mysite.com", "myothersite.com"]
+		path_matcher = "blep"
+	}
+
+	host_rule {
+		hosts        = ["myfavoritesite.com"]
+		path_matcher = "blip"
+	}
+
+	host_rule {
+		hosts        = ["myleastfavoritesite.com"]
+		path_matcher = "blub"
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blep"
+
+		path_rule {
+			paths   = ["/home"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+
+		path_rule {
+			paths   = ["/login"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blub"
+
+		path_rule {
+			paths   = ["/*", "/blub"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "blip"
+
+		path_rule {
+			paths   = ["/*", "/home"]
+			service = "${google_compute_backend_service.foobar.self_link}"
+		}
+	}
 }
 `, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
@@ -331,36 +331,36 @@ resource "google_compute_url_map" "foobar" {
 func testAccComputeUrlMap_noPathRules(bsName, hcName, umName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "foobar" {
-  name          = "urlmap-test-%s"
-  health_checks = [google_compute_http_health_check.zero.self_link]
+	name          = "urlmap-test-%s"
+	health_checks = ["${google_compute_http_health_check.zero.self_link}"]
 }
 
 resource "google_compute_http_health_check" "zero" {
-  name               = "urlmap-test-%s"
-  request_path       = "/"
-  check_interval_sec = 1
-  timeout_sec        = 1
+	name               = "urlmap-test-%s"
+	request_path       = "/"
+	check_interval_sec = 1
+	timeout_sec        = 1
 }
 
 resource "google_compute_url_map" "foobar" {
-  name            = "urlmap-test-%s"
-  default_service = google_compute_backend_service.foobar.self_link
-
-  host_rule {
-    hosts        = ["mysite.com", "myothersite.com"]
-    path_matcher = "boop"
-  }
-
-  path_matcher {
-    default_service = google_compute_backend_service.foobar.self_link
-    name            = "boop"
-  }
-
-  test {
-    host    = "mysite.com"
-    path    = "/*"
-    service = google_compute_backend_service.foobar.self_link
-  }
+	name            = "urlmap-test-%s"
+	default_service = "${google_compute_backend_service.foobar.self_link}"
+
+	host_rule {
+		hosts        = ["mysite.com", "myothersite.com"]
+		path_matcher = "boop"
+	}
+
+	path_matcher {
+		default_service = "${google_compute_backend_service.foobar.self_link}"
+		name            = "boop"
+	}
+
+	test {
+		host    = "mysite.com"
+		path    = "/*"
+		service = "${google_compute_backend_service.foobar.self_link}"
+	}
 }
 `, bsName, hcName, umName)
 }
diff --git a/google/resource_compute_vpn_tunnel_test.go b/google/resource_compute_vpn_tunnel_test.go
index 758bf894f8d..51677e2a2a8 100644
--- a/google/resource_compute_vpn_tunnel_test.go
+++ b/google/resource_compute_vpn_tunnel_test.go
@@ -83,65 +83,57 @@ func TestAccComputeVpnTunnel_defaultTrafficSelectors(t *testing.T) {
 func testAccComputeVpnTunnel_regionFromGateway(region string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name                    = "tunnel-test-%s"
-  auto_create_subnetworks = false
+	name = "tunnel-test-%s"
+	auto_create_subnetworks = false
 }
-
 resource "google_compute_subnetwork" "foobar" {
-  name          = "tunnel-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "%s"
+	name = "tunnel-test-subnetwork-%s"
+	network = "${google_compute_network.foobar.self_link}"
+	ip_cidr_range = "10.0.0.0/16"
+	region = "%s"
 }
-
 resource "google_compute_address" "foobar" {
-  name   = "tunnel-test-%s"
-  region = google_compute_subnetwork.foobar.region
+	name = "tunnel-test-%s"
+	region = "${google_compute_subnetwork.foobar.region}"
 }
-
 resource "google_compute_vpn_gateway" "foobar" {
-  name    = "tunnel-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
+	name = "tunnel-test-%s"
+	network = "${google_compute_network.foobar.self_link}"
+	region = "${google_compute_subnetwork.foobar.region}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_vpn_gateway.foobar.region}"
+	ip_protocol = "ESP"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_forwarding_rule.foobar_esp.region}"
+	ip_protocol = "UDP"
+	port_range = "500-500"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+	ip_protocol = "UDP"
+	port_range = "4500-4500"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_vpn_tunnel" "foobar" {
-  name                    = "tunnel-test-%s"
-  target_vpn_gateway      = google_compute_vpn_gateway.foobar.self_link
-  shared_secret           = "unguessable"
-  peer_ip                 = "8.8.8.8"
-  local_traffic_selector  = [google_compute_subnetwork.foobar.ip_cidr_range]
-  remote_traffic_selector = ["192.168.0.0/24", "192.168.1.0/24"]
-
-  depends_on = [google_compute_forwarding_rule.foobar_udp4500]
-}
-`, acctest.RandString(10), acctest.RandString(10), region, acctest.RandString(10),
+	name = "tunnel-test-%s"
+	target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+	shared_secret = "unguessable"
+	peer_ip = "8.8.8.8"
+	local_traffic_selector = ["${google_compute_subnetwork.foobar.ip_cidr_range}"]
+	remote_traffic_selector = ["192.168.0.0/24", "192.168.1.0/24"]
+
+	depends_on = ["google_compute_forwarding_rule.foobar_udp4500"]
+}`, acctest.RandString(10), acctest.RandString(10), region, acctest.RandString(10),
 		acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
 		acctest.RandString(10), acctest.RandString(10))
 }
@@ -149,127 +141,112 @@ resource "google_compute_vpn_tunnel" "foobar" {
 func testAccComputeVpnTunnelRouter(router string) string {
 	testId := acctest.RandString(10)
 	return fmt.Sprintf(`
-resource "google_compute_network" "foobar" {
-  name                    = "tunnel-test-%s"
-  auto_create_subnetworks = false
-}
-
-resource "google_compute_subnetwork" "foobar" {
-  name          = "tunnel-test-subnetwork-%s"
-  network       = google_compute_network.foobar.self_link
-  ip_cidr_range = "10.0.0.0/16"
-  region        = "us-central1"
-}
-
-resource "google_compute_address" "foobar" {
-  name   = "tunnel-test-%s"
-  region = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_vpn_gateway" "foobar" {
-  name    = "tunnel-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_subnetwork.foobar.region
-}
-
-resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "tunnel-test-%s-1"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "tunnel-test-%s-2"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "tunnel-test-%s-3"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
-}
-
-resource "google_compute_router" "foobar" {
-  name    = "%s"
-  region  = google_compute_forwarding_rule.foobar_udp500.region
-  network = google_compute_network.foobar.self_link
-  bgp {
-    asn = 64514
-  }
-}
-
-resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "tunnel-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-  router             = google_compute_router.foobar.self_link
-}
-`, testId, testId, testId, testId, testId, testId, testId, router, testId)
+		resource "google_compute_network" "foobar" {
+			name = "tunnel-test-%s"
+			auto_create_subnetworks = false
+		}
+		resource "google_compute_subnetwork" "foobar" {
+			name = "tunnel-test-subnetwork-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			ip_cidr_range = "10.0.0.0/16"
+			region = "us-central1"
+		}
+		resource "google_compute_address" "foobar" {
+			name = "tunnel-test-%s"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_vpn_gateway" "foobar" {
+			name = "tunnel-test-%s"
+			network = "${google_compute_network.foobar.self_link}"
+			region = "${google_compute_subnetwork.foobar.region}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_esp" {
+			name = "tunnel-test-%s-1"
+			region = "${google_compute_vpn_gateway.foobar.region}"
+			ip_protocol = "ESP"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp500" {
+			name = "tunnel-test-%s-2"
+			region = "${google_compute_forwarding_rule.foobar_esp.region}"
+			ip_protocol = "UDP"
+			port_range = "500-500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_forwarding_rule" "foobar_udp4500" {
+			name = "tunnel-test-%s-3"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			ip_protocol = "UDP"
+			port_range = "4500-4500"
+			ip_address = "${google_compute_address.foobar.address}"
+			target = "${google_compute_vpn_gateway.foobar.self_link}"
+		}
+		resource "google_compute_router" "foobar"{
+			name = "%s"
+			region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+			network = "${google_compute_network.foobar.self_link}"
+			bgp {
+				asn = 64514
+			}
+		}
+		resource "google_compute_vpn_tunnel" "foobar" {
+			name = "tunnel-test-%s"
+			region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+			target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+			shared_secret = "unguessable"
+			peer_ip = "8.8.8.8"
+			router = "${google_compute_router.foobar.self_link}"
+		}
+	`, testId, testId, testId, testId, testId, testId, testId, router, testId)
 }
 
 func testAccComputeVpnTunnelDefaultTrafficSelectors() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name                    = "tunnel-test-%s"
-  auto_create_subnetworks = "true"
+	name = "tunnel-test-%s"
+	auto_create_subnetworks = "true"
 }
-
 resource "google_compute_address" "foobar" {
-  name   = "tunnel-test-%s"
-  region = "us-central1"
+	name = "tunnel-test-%s"
+	region = "us-central1"
 }
-
 resource "google_compute_vpn_gateway" "foobar" {
-  name    = "tunnel-test-%s"
-  network = google_compute_network.foobar.self_link
-  region  = google_compute_address.foobar.region
+	name = "tunnel-test-%s"
+	network = "${google_compute_network.foobar.self_link}"
+	region = "${google_compute_address.foobar.region}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_esp" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_vpn_gateway.foobar.region
-  ip_protocol = "ESP"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_vpn_gateway.foobar.region}"
+	ip_protocol = "ESP"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_udp500" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_forwarding_rule.foobar_esp.region
-  ip_protocol = "UDP"
-  port_range  = "500-500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_forwarding_rule.foobar_esp.region}"
+	ip_protocol = "UDP"
+	port_range = "500-500"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_forwarding_rule" "foobar_udp4500" {
-  name        = "tunnel-test-%s"
-  region      = google_compute_forwarding_rule.foobar_udp500.region
-  ip_protocol = "UDP"
-  port_range  = "4500-4500"
-  ip_address  = google_compute_address.foobar.address
-  target      = google_compute_vpn_gateway.foobar.self_link
+	name = "tunnel-test-%s"
+	region = "${google_compute_forwarding_rule.foobar_udp500.region}"
+	ip_protocol = "UDP"
+	port_range = "4500-4500"
+	ip_address = "${google_compute_address.foobar.address}"
+	target = "${google_compute_vpn_gateway.foobar.self_link}"
 }
-
 resource "google_compute_vpn_tunnel" "foobar" {
-  name               = "tunnel-test-%s"
-  region             = google_compute_forwarding_rule.foobar_udp4500.region
-  target_vpn_gateway = google_compute_vpn_gateway.foobar.self_link
-  shared_secret      = "unguessable"
-  peer_ip            = "8.8.8.8"
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
+	name = "tunnel-test-%s"
+	region = "${google_compute_forwarding_rule.foobar_udp4500.region}"
+	target_vpn_gateway = "${google_compute_vpn_gateway.foobar.self_link}"
+	shared_secret = "unguessable"
+	peer_ip = "8.8.8.8"
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
 		acctest.RandString(10), acctest.RandString(10), acctest.RandString(10),
 		acctest.RandString(10))
 }
diff --git a/google/resource_container_cluster_test.go b/google/resource_container_cluster_test.go
index 1dd610bc74d..013970933df 100644
--- a/google/resource_container_cluster_test.go
+++ b/google/resource_container_cluster_test.go
@@ -1150,244 +1150,219 @@ func matchError(attr, tf interface{}, gcp interface{}) string {
 func testAccContainerCluster_basic(name string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-}
-`, name)
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
+}`, name)
 }
 
 func testAccContainerCluster_misc(name string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
 
-  remove_default_node_pool = true
+	remove_default_node_pool = true
 
-  node_locations = [
-    "us-central1-b",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-b",
+		"us-central1-c"
+	]
 
-  enable_kubernetes_alpha = true
-  enable_legacy_abac      = true
+	enable_kubernetes_alpha = true
+	enable_legacy_abac      = true
 
-  logging_service    = "logging.googleapis.com"
-  monitoring_service = "monitoring.googleapis.com"
+	logging_service    = "logging.googleapis.com"
+	monitoring_service = "monitoring.googleapis.com"
 
-  resource_labels = {
-    created-by = "terraform"
-  }
+	resource_labels = {
+		created-by = "terraform"
+	}
 
-}
-`, name)
+}`, name)
 }
 
 func testAccContainerCluster_misc_update(name string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
 
-  remove_default_node_pool = true # Not worth updating
+	remove_default_node_pool = true  # Not worth updating
 
-  node_locations = [
-    "us-central1-f",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-f",
+		"us-central1-c",
+	]
 
-  enable_kubernetes_alpha = true # Not updatable
-  enable_legacy_abac      = false
+	enable_kubernetes_alpha = true  # Not updatable
+	enable_legacy_abac      = false
 
-  logging_service    = "none"
-  monitoring_service = "none"
+	logging_service    = "none"
+	monitoring_service = "none"
 
-  resource_labels = {
-    created-by = "terraform-update"
-    new-label  = "update"
-  }
+	resource_labels = {
+		created-by = "terraform-update"
+		new-label  = "update"
+	}
 
-}
-`, name)
+}`, name)
 }
 
 func testAccContainerCluster_withAddons(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-
-  addons_config {
-    http_load_balancing {
-      disabled = true
-    }
-    horizontal_pod_autoscaling {
-      disabled = true
-    }
-    network_policy_config {
-      disabled = true
-    }
-  }
-}
-`, clusterName)
+	name = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+
+	addons_config {
+		http_load_balancing { disabled = true }
+		horizontal_pod_autoscaling { disabled = true }
+		network_policy_config { disabled = true }
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_updateAddons(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "primary" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-
-  addons_config {
-    http_load_balancing {
-      disabled = false
-    }
-    horizontal_pod_autoscaling {
-      disabled = false
-    }
-    network_policy_config {
-      disabled = false
-    }
-  }
-}
-`, clusterName)
+	name = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+
+	addons_config {
+		http_load_balancing { disabled = false }
+		horizontal_pod_autoscaling { disabled = false }
+		network_policy_config { disabled = false }
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withMasterAuth(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_auth" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 
-  master_auth {
-    username = "mr.yoda"
-    password = "adoy.rm.123456789"
-  }
-}
-`, clusterName)
+	master_auth {
+		username = "mr.yoda"
+		password = "adoy.rm.123456789"
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_updateMasterAuth(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_auth" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 
-  master_auth {
-    username = "mr.yoda.adoy.mr"
-    password = "adoy.rm.123456789.mr.yoda"
-  }
-}
-`, clusterName)
+	master_auth {
+		username = "mr.yoda.adoy.mr"
+		password = "adoy.rm.123456789.mr.yoda"
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_disableMasterAuth(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_auth" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 
-  master_auth {
-    username = ""
-    password = ""
-  }
-}
-`, clusterName)
+	master_auth {
+		username = ""
+		password = ""
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withMasterAuthNoCert() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_auth_no_cert" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
-
-  master_auth {
-    username = "mr.yoda"
-    password = "adoy.rm.123456789"
-    client_certificate_config {
-      issue_client_certificate = false
-    }
-  }
-}
-`, acctest.RandString(10))
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 3
+
+	master_auth {
+		username = "mr.yoda"
+		password = "adoy.rm.123456789"
+		client_certificate_config {
+			issue_client_certificate = false
+		}
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccContainerCluster_withNetworkPolicyEnabled(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_network_policy_enabled" {
-  name                     = "%s"
-  location                 = "us-central1-a"
-  initial_node_count       = 1
-  remove_default_node_pool = true
-
-  network_policy {
-    enabled  = true
-    provider = "CALICO"
-  }
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	remove_default_node_pool = true
+
+	network_policy {
+		enabled = true
+		provider = "CALICO"
+	}
 
-  addons_config {
-    network_policy_config {
-      disabled = false
-    }
-  }
-}
-`, clusterName)
+	addons_config {
+		network_policy_config {
+			disabled = false
+		}
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_removeNetworkPolicy(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_network_policy_enabled" {
-  name                     = "%s"
-  location                 = "us-central1-a"
-  initial_node_count       = 1
-  remove_default_node_pool = true
-}
-`, clusterName)
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	remove_default_node_pool = true
+}`, clusterName)
 }
 
 func testAccContainerCluster_withNetworkPolicyDisabled(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_network_policy_enabled" {
-  name                     = "%s"
-  location                 = "us-central1-a"
-  initial_node_count       = 1
-  remove_default_node_pool = true
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	remove_default_node_pool = true
 
-  network_policy {
-    enabled = false
-  }
-}
-`, clusterName)
+	network_policy {
+		enabled = false
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withNetworkPolicyConfigDisabled(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_network_policy_enabled" {
-  name                     = "%s"
-  location                 = "us-central1-a"
-  initial_node_count       = 1
-  remove_default_node_pool = true
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	remove_default_node_pool = true
 
-  network_policy {
-    enabled = false
-  }
+	network_policy {
+		enabled = false
+	}
 
-  addons_config {
-    network_policy_config {
-      disabled = true
-    }
-  }
-}
-`, clusterName)
+	addons_config {
+		network_policy_config {
+			disabled = true
+		}
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withMasterAuthorizedNetworksConfig(clusterName string, cidrs []string, emptyValue string) string {
@@ -1407,345 +1382,331 @@ func testAccContainerCluster_withMasterAuthorizedNetworksConfig(clusterName stri
 
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_authorized_networks" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  master_authorized_networks_config {
-    %s
-  }
-}
-`, clusterName, cidrBlocks)
+	master_authorized_networks_config {
+		%s
+	}
+}`, clusterName, cidrBlocks)
 }
 
 func testAccContainerCluster_removeMasterAuthorizedNetworksConfig(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_master_authorized_networks" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-}
-`, clusterName)
+	name = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+}`, clusterName)
 }
 
 func testAccContainerCluster_regional(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "regional" {
-  name               = "%s"
-  location           = "us-central1"
-  initial_node_count = 1
-}
-`, clusterName)
+	name               = "%s"
+	location           = "us-central1"
+	initial_node_count = 1
+}`, clusterName)
 }
 
 func testAccContainerCluster_regionalWithNodePool(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "regional" {
-  name     = "%s"
-  location = "us-central1"
+	name     = "%s"
+	location = "us-central1"
 
-  node_pool {
-    name = "%s"
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name = "%s"
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_regionalNodeLocations(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_locations" {
-  name               = "%s"
-  location           = "us-central1"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1"
+	initial_node_count = 1
 
-  node_locations = [
-    "us-central1-f",
-    "us-central1-c",
-  ]
-}
-`, clusterName)
+	node_locations = [
+		"us-central1-f",
+		"us-central1-c",
+	]
+}`, clusterName)
 }
 
 func testAccContainerCluster_regionalUpdateNodeLocations(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_locations" {
-  name               = "%s"
-  location           = "us-central1"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1"
+	initial_node_count = 1
 
-  node_locations = [
-    "us-central1-f",
-    "us-central1-b",
-  ]
-}
-`, clusterName)
+	node_locations = [
+		"us-central1-f",
+		"us-central1-b",
+	]
+}`, clusterName)
 }
 
 func testAccContainerCluster_withVersion(clusterName string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_version" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  min_master_version = data.google_container_engine_versions.central1a.latest_master_version
-  initial_node_count = 1
-}
-`, clusterName)
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	min_master_version = "${data.google_container_engine_versions.central1a.latest_master_version}"
+	initial_node_count = 1
+}`, clusterName)
 }
 
 func testAccContainerCluster_withLowerVersion(clusterName string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_version" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  min_master_version = data.google_container_engine_versions.central1a.valid_master_versions[2]
-  initial_node_count = 1
-}
-`, clusterName)
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.2}"
+	initial_node_count = 1
+}`, clusterName)
 }
 
 func testAccContainerCluster_updateVersion(clusterName string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_version" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  min_master_version = data.google_container_engine_versions.central1a.valid_master_versions[1]
-  node_version       = data.google_container_engine_versions.central1a.valid_node_versions[1]
-  initial_node_count = 1
-}
-`, clusterName)
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.1}"
+	node_version = "${data.google_container_engine_versions.central1a.valid_node_versions.1}"
+	initial_node_count = 1
+}`, clusterName)
 }
 
 func testAccContainerCluster_withNodeConfig(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-f"
+	initial_node_count = 1
+
+	node_config {
+		machine_type = "n1-standard-1"
+		disk_size_gb = 15
+		disk_type = "pd-ssd"
+		local_ssd_count = 1
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/monitoring",
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write"
+		]
+		service_account = "default"
+		metadata = {
+			foo = "bar"
+			disable-legacy-endpoints = "true"
+		}
+		labels = {
+			foo = "bar"
+		}
+		tags = ["foo", "bar"]
+		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
+
+		taint {
+			key = "taint_key"
+			value = "taint_value"
+			effect = "PREFER_NO_SCHEDULE"
+		}
 
-  node_config {
-    machine_type    = "n1-standard-1"
-    disk_size_gb    = 15
-    disk_type       = "pd-ssd"
-    local_ssd_count = 1
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-    ]
-    service_account = "default"
-    metadata = {
-      foo                      = "bar"
-      disable-legacy-endpoints = "true"
-    }
-    labels = {
-      foo = "bar"
-    }
-    tags             = ["foo", "bar"]
-    preemptible      = true
-    min_cpu_platform = "Intel Broadwell"
-
-    taint {
-      key    = "taint_key"
-      value  = "taint_value"
-      effect = "PREFER_NO_SCHEDULE"
-    }
-
-    taint {
-      key    = "taint_key2"
-      value  = "taint_value2"
-      effect = "NO_EXECUTE"
-    }
-
-    // Updatable fields
-    image_type = "COS"
-  }
-}
-`, clusterName)
+		taint {
+			key = "taint_key2"
+			value = "taint_value2"
+			effect = "NO_EXECUTE"
+		}
+
+		// Updatable fields
+		image_type = "COS"
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withNodeConfigUpdate(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-f"
+	initial_node_count = 1
+
+	node_config {
+		machine_type = "n1-standard-1"
+		disk_size_gb = 15
+		disk_type = "pd-ssd"
+		local_ssd_count = 1
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/monitoring",
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write"
+		]
+		service_account = "default"
+		metadata = {
+			foo = "bar"
+			disable-legacy-endpoints = "true"
+		}
+		labels = {
+			foo = "bar"
+		}
+		tags = ["foo", "bar"]
+		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
+
+		taint {
+			key = "taint_key"
+			value = "taint_value"
+			effect = "PREFER_NO_SCHEDULE"
+		}
 
-  node_config {
-    machine_type    = "n1-standard-1"
-    disk_size_gb    = 15
-    disk_type       = "pd-ssd"
-    local_ssd_count = 1
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-    ]
-    service_account = "default"
-    metadata = {
-      foo                      = "bar"
-      disable-legacy-endpoints = "true"
-    }
-    labels = {
-      foo = "bar"
-    }
-    tags             = ["foo", "bar"]
-    preemptible      = true
-    min_cpu_platform = "Intel Broadwell"
-
-    taint {
-      key    = "taint_key"
-      value  = "taint_value"
-      effect = "PREFER_NO_SCHEDULE"
-    }
-
-    taint {
-      key    = "taint_key2"
-      value  = "taint_value2"
-      effect = "NO_EXECUTE"
-    }
-
-    // Updatable fields
-    image_type = "UBUNTU"
-  }
-}
-`, clusterName)
+		taint {
+			key = "taint_key2"
+			value = "taint_value2"
+			effect = "NO_EXECUTE"
+		}
+
+		// Updatable fields
+		image_type = "UBUNTU"
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_withNodeConfigScopeAlias() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config_scope_alias" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-f"
-  initial_node_count = 1
-
-  node_config {
-    machine_type = "g1-small"
-    disk_size_gb = 15
-    oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
-  }
-}
-`, acctest.RandString(10))
+	name     = "cluster-test-%s"
+	location = "us-central1-f"
+	initial_node_count = 1
+
+	node_config {
+		machine_type = "g1-small"
+		disk_size_gb = 15
+		oauth_scopes = [ "compute-rw", "storage-ro", "logging-write", "monitoring" ]
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccContainerCluster_withNodeConfigShieldedInstanceConfig(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_config" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 1
+	name = "%s"
+	location = "us-central1-f"
+	initial_node_count = 1
+
+	node_config {
+		machine_type = "n1-standard-1"
+		disk_size_gb = 15
+		disk_type = "pd-ssd"
+		local_ssd_count = 1
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/monitoring",
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write"
+		]
+		service_account = "default"
+		metadata = {
+			foo = "bar"
+			disable-legacy-endpoints = "true"
+		}
+		labels = {
+			foo = "bar"
+		}
+		tags = ["foo", "bar"]
+		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
 
-  node_config {
-    machine_type    = "n1-standard-1"
-    disk_size_gb    = 15
-    disk_type       = "pd-ssd"
-    local_ssd_count = 1
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-    ]
-    service_account = "default"
-    metadata = {
-      foo                      = "bar"
-      disable-legacy-endpoints = "true"
-    }
-    labels = {
-      foo = "bar"
-    }
-    tags             = ["foo", "bar"]
-    preemptible      = true
-    min_cpu_platform = "Intel Broadwell"
-
-    // Updatable fields
-    image_type = "COS"
-
-    shielded_instance_config {
-      enable_secure_boot          = true
-      enable_integrity_monitoring = true
-    }
-  }
-}
-`, clusterName)
+		// Updatable fields
+		image_type = "COS"
+
+		shielded_instance_config {
+			enable_secure_boot          = true
+			enable_integrity_monitoring = true
+		}
+	}
+}`, clusterName)
 }
 
 func testAccContainerCluster_networkRef() string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = true
+	name = "container-net-%s"
+	auto_create_subnetworks = true
 }
 
 resource "google_container_cluster" "with_net_ref_by_url" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  network = google_compute_network.container_network.self_link
+	network = "${google_compute_network.container_network.self_link}"
 }
 
 resource "google_container_cluster" "with_net_ref_by_name" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  network = google_compute_network.container_network.name
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
+	network = "${google_compute_network.container_network.name}"
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccContainerCluster_backendRef() string {
 	return fmt.Sprintf(`
 resource "google_compute_backend_service" "my-backend-service" {
-  name      = "terraform-test-%s"
+  name		= "terraform-test-%s"
   port_name = "http"
-  protocol  = "HTTP"
+  protocol	= "HTTP"
 
   backend {
-    group = element(google_container_cluster.primary.instance_group_urls, 1)
+	group = "${element(google_container_cluster.primary.instance_group_urls, 1)}"
   }
 
-  health_checks = [google_compute_http_health_check.default.self_link]
+  health_checks = ["${google_compute_http_health_check.default.self_link}"]
 }
 
 resource "google_compute_http_health_check" "default" {
-  name               = "terraform-test-%s"
-  request_path       = "/"
+  name				 = "terraform-test-%s"
+  request_path		 = "/"
   check_interval_sec = 1
-  timeout_sec        = 1
+  timeout_sec		 = 1
 }
 
 resource "google_container_cluster" "primary" {
-  name               = "terraform-test-%s"
-  location           = "us-central1-a"
+  name				 = "terraform-test-%s"
+  location			 = "us-central1-a"
   initial_node_count = 3
 
   node_locations = [
-    "us-central1-b",
-    "us-central1-c",
+	"us-central1-b",
+	"us-central1-c",
   ]
 
   node_config {
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-    ]
+	oauth_scopes = [
+	  "https://www.googleapis.com/auth/compute",
+	  "https://www.googleapis.com/auth/devstorage.read_only",
+	  "https://www.googleapis.com/auth/logging.write",
+	  "https://www.googleapis.com/auth/monitoring",
+	]
   }
 }
 `, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
@@ -1754,213 +1715,204 @@ resource "google_container_cluster" "primary" {
 func testAccContainerCluster_withNodePoolBasic(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  node_pool {
-    name               = "%s"
-    initial_node_count = 2
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name			   = "%s"
+		initial_node_count = 2
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_withNodePoolLowerVersion(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  min_master_version = data.google_container_engine_versions.central1a.valid_master_versions[1]
+	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.1}"
 
-  node_pool {
-    name               = "%s"
-    initial_node_count = 2
-    version            = data.google_container_engine_versions.central1a.valid_node_versions[2]
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name			   = "%s"
+		initial_node_count = 2
+		version			   = "${data.google_container_engine_versions.central1a.valid_node_versions.2}"
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_withNodePoolUpdateVersion(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  min_master_version = data.google_container_engine_versions.central1a.valid_master_versions[1]
+	min_master_version = "${data.google_container_engine_versions.central1a.valid_master_versions.1}"
 
-  node_pool {
-    name               = "%s"
-    initial_node_count = 2
-    version            = data.google_container_engine_versions.central1a.valid_node_versions[1]
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name			   = "%s"
+		initial_node_count = 2
+		version			   = "${data.google_container_engine_versions.central1a.valid_node_versions.1}"
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_withNodePoolNodeLocations(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  node_locations = [
-    "us-central1-b",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-b",
+		"us-central1-c"
+	]
 
-  node_pool {
-    name       = "%s"
-    node_count = 2
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name	   = "%s"
+		node_count = 2
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_withNodePoolResize(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  node_locations = [
-    "us-central1-b",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-b",
+		"us-central1-c"
+	]
 
-  node_pool {
-    name       = "%s"
-    node_count = 3
-  }
-}
-`, cluster, nodePool)
+	node_pool {
+		name	   = "%s"
+		node_count = 3
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerCluster_withNodePoolAutoscaling(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
-
-  node_pool {
-    name               = "%s"
-    initial_node_count = 2
-    autoscaling {
-      min_node_count = 1
-      max_node_count = 3
-    }
-  }
-}
-`, cluster, np)
+	name     = "%s"
+	location = "us-central1-a"
+
+	node_pool {
+		name			   = "%s"
+		initial_node_count = 2
+		autoscaling {
+			min_node_count = 1
+			max_node_count = 3
+		}
+	}
+}`, cluster, np)
 }
 
 func testAccContainerCluster_withNodePoolUpdateAutoscaling(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool" {
-  name     = "%s"
-  location = "us-central1-a"
-
-  node_pool {
-    name               = "%s"
-    initial_node_count = 2
-    autoscaling {
-      min_node_count = 1
-      max_node_count = 5
-    }
-  }
-}
-`, cluster, np)
+	name     = "%s"
+	location = "us-central1-a"
+
+	node_pool {
+		name			   = "%s"
+		initial_node_count = 2
+		autoscaling {
+			min_node_count = 1
+			max_node_count = 5
+		}
+	}
+}`, cluster, np)
 }
 
 func testAccContainerCluster_withNodePoolNamePrefix() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool_name_prefix" {
-  name     = "tf-cluster-nodepool-test-%s"
-  location = "us-central1-a"
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-a"
 
-  node_pool {
-    name_prefix = "tf-np-test"
-    node_count  = 2
-  }
-}
-`, acctest.RandString(10))
+	node_pool {
+		name_prefix = "tf-np-test"
+		node_count	= 2
+	}
+}`, acctest.RandString(10))
 }
 
 func testAccContainerCluster_withNodePoolMultiple() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool_multiple" {
-  name     = "tf-cluster-nodepool-test-%s"
-  location = "us-central1-a"
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-a"
 
-  node_pool {
-    name       = "tf-cluster-nodepool-test-%s"
-    node_count = 2
-  }
+	node_pool {
+		name	   = "tf-cluster-nodepool-test-%s"
+		node_count = 2
+	}
 
-  node_pool {
-    name       = "tf-cluster-nodepool-test-%s"
-    node_count = 3
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
+	node_pool {
+		name	   = "tf-cluster-nodepool-test-%s"
+		node_count = 3
+	}
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccContainerCluster_withNodePoolConflictingNameFields() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool_multiple" {
-  name     = "tf-cluster-nodepool-test-%s"
-  location = "us-central1-a"
-
-  node_pool {
-    # ERROR: name and name_prefix cannot be both specified
-    name        = "tf-cluster-nodepool-test-%s"
-    name_prefix = "tf-cluster-nodepool-test-"
-    node_count  = 1
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-a"
+
+	node_pool {
+		# ERROR: name and name_prefix cannot be both specified
+		name		= "tf-cluster-nodepool-test-%s"
+		name_prefix = "tf-cluster-nodepool-test-"
+		node_count	= 1
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccContainerCluster_withNodePoolNodeConfig() string {
 	testId := acctest.RandString(10)
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_node_pool_node_config" {
-  name     = "tf-cluster-nodepool-test-%s"
-  location = "us-central1-a"
-  node_pool {
-    name       = "tf-cluster-nodepool-test-%s"
-    node_count = 2
-    node_config {
-      machine_type    = "n1-standard-1"
-      disk_size_gb    = 15
-      local_ssd_count = 1
-      oauth_scopes = [
-        "https://www.googleapis.com/auth/compute",
-        "https://www.googleapis.com/auth/devstorage.read_only",
-        "https://www.googleapis.com/auth/logging.write",
-        "https://www.googleapis.com/auth/monitoring",
-      ]
-      service_account = "default"
-      metadata = {
-        foo                      = "bar"
-        disable-legacy-endpoints = "true"
-      }
-      image_type = "COS"
-      labels = {
-        foo = "bar"
-      }
-      tags = ["foo", "bar"]
-    }
-  }
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-a"
+	node_pool {
+		name = "tf-cluster-nodepool-test-%s"
+		node_count = 2
+		node_config {
+			machine_type = "n1-standard-1"
+			disk_size_gb = 15
+			local_ssd_count = 1
+			oauth_scopes = [
+				"https://www.googleapis.com/auth/compute",
+				"https://www.googleapis.com/auth/devstorage.read_only",
+				"https://www.googleapis.com/auth/logging.write",
+				"https://www.googleapis.com/auth/monitoring"
+			]
+			service_account = "default"
+			metadata = {
+				foo = "bar"
+				disable-legacy-endpoints = "true"
+			}
+			image_type = "COS"
+			labels = {
+				foo = "bar"
+			}
+			tags = ["foo", "bar"]
+		}
+	}
+
 }
 `, testId, testId)
 }
@@ -1978,207 +1930,200 @@ func testAccContainerCluster_withMaintenanceWindow(clusterName string, startTime
 
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_maintenance_window" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-  %s
-}
-`, clusterName, maintenancePolicy)
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+
+	%s
+}`, clusterName, maintenancePolicy)
 }
 
 func testAccContainerCluster_withIPAllocationPolicy_existingSecondaryRanges(cluster string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name    = google_compute_network.container_network.name
-  network = google_compute_network.container_network.name
-  region  = "us-central1"
+	name    = "${google_compute_network.container_network.name}"
+	network = "${google_compute_network.container_network.name}"
+	region  = "us-central1"
 
-  ip_cidr_range = "10.0.0.0/24"
+	ip_cidr_range = "10.0.0.0/24"
 
-  secondary_ip_range {
-    range_name    = "pods"
-    ip_cidr_range = "10.1.0.0/16"
-  }
-  secondary_ip_range {
-    range_name    = "services"
-    ip_cidr_range = "10.2.0.0/20"
-  }
+	secondary_ip_range {
+		range_name    = "pods"
+		ip_cidr_range = "10.1.0.0/16"
+	}
+	secondary_ip_range {
+		range_name    = "services"
+		ip_cidr_range = "10.2.0.0/20"
+	}
 }
 
 resource "google_container_cluster" "with_ip_allocation_policy" {
-  name     = "%s"
-  location = "us-central1-a"
+	name     = "%s"
+	location = "us-central1-a"
 
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
+	network = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
 
-  initial_node_count = 1
-  ip_allocation_policy {
-    cluster_secondary_range_name  = "pods"
-    services_secondary_range_name = "services"
-  }
-}
-`, cluster, cluster)
+	initial_node_count = 1
+	ip_allocation_policy {
+		cluster_secondary_range_name  = "pods"
+		services_secondary_range_name = "services"
+	}
+}`, cluster, cluster)
 }
 
 func testAccContainerCluster_withIPAllocationPolicy_specificIPRanges(cluster string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name    = google_compute_network.container_network.name
-  network = google_compute_network.container_network.name
-  region  = "us-central1"
+	name    = "${google_compute_network.container_network.name}"
+	network = "${google_compute_network.container_network.name}"
+	region  = "us-central1"
 
-  ip_cidr_range = "10.2.0.0/16"
+	ip_cidr_range = "10.2.0.0/16"
 }
 
 resource "google_container_cluster" "with_ip_allocation_policy" {
-  name       = "%s"
-  location   = "us-central1-a"
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
-
-  initial_node_count = 1
-  ip_allocation_policy {
-    cluster_ipv4_cidr_block  = "10.0.0.0/16"
-    services_ipv4_cidr_block = "10.1.0.0/16"
-  }
-}
-`, cluster, cluster)
+	name       = "%s"
+	location   = "us-central1-a"
+	network    = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
+
+	initial_node_count = 1
+	ip_allocation_policy {
+		cluster_ipv4_cidr_block  = "10.0.0.0/16"
+		services_ipv4_cidr_block = "10.1.0.0/16"
+	}
+}`, cluster, cluster)
 }
 
 func testAccContainerCluster_withIPAllocationPolicy_specificSizes(cluster string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name    = google_compute_network.container_network.name
-  network = google_compute_network.container_network.name
-  region  = "us-central1"
+	name    = "${google_compute_network.container_network.name}"
+	network = "${google_compute_network.container_network.name}"
+	region  = "us-central1"
 
-  ip_cidr_range = "10.2.0.0/16"
+	ip_cidr_range = "10.2.0.0/16"
 }
 
 resource "google_container_cluster" "with_ip_allocation_policy" {
-  name       = "%s"
-  location   = "us-central1-a"
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
-
-  initial_node_count = 1
-  ip_allocation_policy {
-    cluster_ipv4_cidr_block  = "/16"
-    services_ipv4_cidr_block = "/22"
-  }
-}
-`, cluster, cluster)
+	name       = "%s"
+	location   = "us-central1-a"
+	network    = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
+
+	initial_node_count = 1
+	ip_allocation_policy {
+		cluster_ipv4_cidr_block  = "/16"
+		services_ipv4_cidr_block = "/22"
+	}
+}`, cluster, cluster)
 }
 
 func testAccContainerCluster_withPrivateClusterConfigMissingCidrBlock(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name                     = google_compute_network.container_network.name
-  network                  = google_compute_network.container_network.name
-  ip_cidr_range            = "10.0.36.0/24"
-  region                   = "us-central1"
-  private_ip_google_access = true
-
-  secondary_ip_range {
-    range_name    = "pod"
-    ip_cidr_range = "10.0.0.0/19"
-  }
+	name					 = "${google_compute_network.container_network.name}"
+	network					 = "${google_compute_network.container_network.name}"
+	ip_cidr_range			 = "10.0.36.0/24"
+	region				 = "us-central1"
+	private_ip_google_access = true
+
+	secondary_ip_range {
+		range_name	  = "pod"
+		ip_cidr_range = "10.0.0.0/19"
+	}
 
-  secondary_ip_range {
-    range_name    = "svc"
-    ip_cidr_range = "10.0.32.0/22"
-  }
+	secondary_ip_range {
+		range_name	  = "svc"
+		ip_cidr_range = "10.0.32.0/22"
+	}
 }
 
 resource "google_container_cluster" "with_private_cluster" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
+	network = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
 
-  private_cluster_config {
-    enable_private_endpoint = true
-    enable_private_nodes    = true
-  }
-  master_authorized_networks_config {
-  }
-  ip_allocation_policy {
-    cluster_secondary_range_name  = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name
-    services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name
-  }
-}
-`, clusterName, clusterName)
+	private_cluster_config {
+		enable_private_endpoint = true
+		enable_private_nodes = true
+	}
+	master_authorized_networks_config { }
+	ip_allocation_policy {
+		cluster_secondary_range_name  = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.0.range_name}"
+		services_secondary_range_name = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.1.range_name}"
+	}
+}`, clusterName, clusterName)
 }
 
 func testAccContainerCluster_withPrivateClusterConfig(clusterName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name                     = google_compute_network.container_network.name
-  network                  = google_compute_network.container_network.name
-  ip_cidr_range            = "10.0.36.0/24"
-  region                   = "us-central1"
-  private_ip_google_access = true
-
-  secondary_ip_range {
-    range_name    = "pod"
-    ip_cidr_range = "10.0.0.0/19"
-  }
+	name					 = "${google_compute_network.container_network.name}"
+	network					 = "${google_compute_network.container_network.name}"
+	ip_cidr_range			 = "10.0.36.0/24"
+	region				 = "us-central1"
+	private_ip_google_access = true
+
+	secondary_ip_range {
+		range_name	  = "pod"
+		ip_cidr_range = "10.0.0.0/19"
+	}
 
-  secondary_ip_range {
-    range_name    = "svc"
-    ip_cidr_range = "10.0.32.0/22"
-  }
+	secondary_ip_range {
+		range_name	  = "svc"
+		ip_cidr_range = "10.0.32.0/22"
+	}
 }
 
 resource "google_container_cluster" "with_private_cluster" {
-  name               = "cluster-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "cluster-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
+	network = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
 
-  private_cluster_config {
-    enable_private_endpoint = true
-    enable_private_nodes    = true
-    master_ipv4_cidr_block  = "10.42.0.0/28"
-  }
-  master_authorized_networks_config {
-  }
-  ip_allocation_policy {
-    cluster_secondary_range_name  = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name
-    services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name
-  }
-}
-`, clusterName, clusterName)
+	private_cluster_config {
+		enable_private_endpoint = true
+		enable_private_nodes = true
+		master_ipv4_cidr_block = "10.42.0.0/28"
+	}
+	master_authorized_networks_config { }
+	ip_allocation_policy {
+		cluster_secondary_range_name  = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.0.range_name}"
+		services_secondary_range_name = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.1.range_name}"
+	}
+}`, clusterName, clusterName)
 }
 
 func testAccContainerCluster_withInitialCIDR(clusterName string) string {
@@ -2189,8 +2134,8 @@ resource "google_compute_network" "container_network" {
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name          = google_compute_network.container_network.name
-  network       = google_compute_network.container_network.name
+  name          = "${google_compute_network.container_network.name}"
+  network       = "${google_compute_network.container_network.name}"
   ip_cidr_range = "10.128.0.0/9"
 }
 
@@ -2198,14 +2143,14 @@ resource "google_container_cluster" "cidr_error_preempt" {
   name     = "%s"
   location = "us-central1-a"
 
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
+  network    = "${google_compute_network.container_network.name}"
+  subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
 
   initial_node_count = 1
 
   ip_allocation_policy {
-    cluster_ipv4_cidr_block  = "10.0.0.0/16"
-    services_ipv4_cidr_block = "10.1.0.0/16"
+	cluster_ipv4_cidr_block = "10.0.0.0/16"
+	services_ipv4_cidr_block = "10.1.0.0/16"
   }
 }
 `, clusterName, clusterName)
@@ -2213,20 +2158,20 @@ resource "google_container_cluster" "cidr_error_preempt" {
 
 func testAccContainerCluster_withCIDROverlap(initConfig, secondCluster string) string {
 	return fmt.Sprintf(`
-  %s
+%s
 
 resource "google_container_cluster" "cidr_error_overlap" {
   name     = "%s"
   location = "us-central1-a"
 
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
+  network    = "${google_compute_network.container_network.name}"
+  subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
 
   initial_node_count = 1
 
   ip_allocation_policy {
-    cluster_ipv4_cidr_block  = "10.0.0.0/16"
-    services_ipv4_cidr_block = "10.1.0.0/16"
+	cluster_ipv4_cidr_block = "10.0.0.0/16"
+	services_ipv4_cidr_block = "10.1.0.0/16"
   }
 }
 `, initConfig, secondCluster)
@@ -2235,9 +2180,9 @@ resource "google_container_cluster" "cidr_error_overlap" {
 func testAccContainerCluster_withInvalidLocation(location string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "with_resource_labels" {
-  name               = "invalid-gke-cluster"
-  location           = "%s"
-  initial_node_count = 1
+	name     = "invalid-gke-cluster"
+	location = "%s"
+	initial_node_count = 1
 }
 `, location)
 }
@@ -2286,5 +2231,6 @@ resource "google_container_cluster" "with_private_cluster" {
     services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name
   }
 }
+
 `, clusterName, clusterName)
 }
diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
index e51cf60f21c..bf4c7d96d45 100644
--- a/google/resource_container_node_pool_test.go
+++ b/google/resource_container_node_pool_test.go
@@ -574,615 +574,588 @@ func testAccCheckContainerNodePoolDestroy(s *terraform.State) error {
 func testAccContainerNodePool_basic(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-}
-`, cluster, np)
+	name               = "%s"
+	location           = "us-central1-a"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_maxPodsPerNode(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "container_network" {
-  name                    = "container-net-%s"
-  auto_create_subnetworks = false
+	name = "container-net-%s"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "container_subnetwork" {
-  name                     = google_compute_network.container_network.name
-  network                  = google_compute_network.container_network.name
-  ip_cidr_range            = "10.0.36.0/24"
-  region                   = "us-central1"
-  private_ip_google_access = true
-
-  secondary_ip_range {
-    range_name    = "pod"
-    ip_cidr_range = "10.0.0.0/19"
-  }
+	name                     = "${google_compute_network.container_network.name}"
+	network                  = "${google_compute_network.container_network.name}"
+	ip_cidr_range            = "10.0.36.0/24"
+	region                   = "us-central1"
+	private_ip_google_access = true
+
+	secondary_ip_range {
+		range_name    = "pod"
+		ip_cidr_range = "10.0.0.0/19"
+	}
 
-  secondary_ip_range {
-    range_name    = "svc"
-    ip_cidr_range = "10.0.32.0/22"
-  }
+	secondary_ip_range {
+		range_name    = "svc"
+		ip_cidr_range = "10.0.32.0/22"
+	}
 }
 
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
-
-  network    = google_compute_network.container_network.name
-  subnetwork = google_compute_subnetwork.container_subnetwork.name
-  ip_allocation_policy {
-    cluster_secondary_range_name  = google_compute_subnetwork.container_subnetwork.secondary_ip_range[0].range_name
-    services_secondary_range_name = google_compute_subnetwork.container_subnetwork.secondary_ip_range[1].range_name
-  }
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
+
+	network = "${google_compute_network.container_network.name}"
+	subnetwork = "${google_compute_subnetwork.container_subnetwork.name}"
+	ip_allocation_policy {
+		cluster_secondary_range_name  = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.0.range_name}"
+		services_secondary_range_name = "${google_compute_subnetwork.container_subnetwork.secondary_ip_range.1.range_name}"
+	}
 
-  private_cluster_config {
-    enable_private_endpoint = true
-    enable_private_nodes    = true
-    master_ipv4_cidr_block  = "10.42.0.0/28"
-  }
+	private_cluster_config {
+		enable_private_endpoint = true
+		enable_private_nodes = true
+		master_ipv4_cidr_block = "10.42.0.0/28"
+	}
 
-  master_authorized_networks_config {
-  }
+	master_authorized_networks_config {
+	}
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  max_pods_per_node  = 30
-  initial_node_count = 2
-}
-`, cluster, cluster, np)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	max_pods_per_node = 30
+	initial_node_count = 2
+}`, cluster, cluster, np)
 }
 
 func testAccContainerNodePool_regionalClusters(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  cluster            = google_container_cluster.cluster.name
-  location           = "us-central1"
-  initial_node_count = 2
-}
-`, cluster, np)
+	name               = "%s"
+	cluster            = "${google_container_cluster.cluster.name}"
+	location           = "us-central1"
+	initial_node_count = 2
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_namePrefix(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 }
-
 resource "google_container_node_pool" "np" {
-  name_prefix        = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-}
-`, cluster, np)
+	name_prefix = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_noName(cluster string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-}
-`, cluster)
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+}`, cluster)
 }
 
 func testAccContainerNodePool_regionalAutoscaling(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-  autoscaling {
-    min_node_count = 1
-    max_node_count = 3
-  }
-}
-`, cluster, np)
+	name     = "%s"
+	location = "us-central1"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+	autoscaling {
+		min_node_count = 1
+		max_node_count = 3
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_autoscaling(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-  autoscaling {
-    min_node_count = 1
-    max_node_count = 3
-  }
-}
-`, cluster, np)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+	autoscaling {
+		min_node_count = 1
+		max_node_count = 3
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_updateAutoscaling(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 3
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-  autoscaling {
-    min_node_count = 0
-    max_node_count = 5
-  }
-}
-`, cluster, np)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+	autoscaling {
+		min_node_count = 0
+		max_node_count = 5
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_additionalZones(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 
-  node_locations = [
-    "us-central1-b",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-b",
+		"us-central1-c"
+	]
 }
 
 resource "google_container_node_pool" "np" {
-  name       = "%s"
-  location   = "us-central1-a"
-  cluster    = google_container_cluster.cluster.name
-  node_count = 2
-}
-`, cluster, nodePool)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	node_count = 2
+}`, cluster, nodePool)
 }
 
 func testAccContainerNodePool_resize(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
 
-  node_locations = [
-    "us-central1-b",
-    "us-central1-c",
-  ]
+	node_locations = [
+		"us-central1-b",
+		"us-central1-c"
+	]
 }
 
 resource "google_container_node_pool" "np" {
-  name       = "%s"
-  location   = "us-central1-a"
-  cluster    = google_container_cluster.cluster.name
-  node_count = 3
-}
-`, cluster, nodePool)
+	name       = "%s"
+	location   = "us-central1-a"
+	cluster    = "${google_container_cluster.cluster.name}"
+	node_count = 3
+}`, cluster, nodePool)
 }
 
 func testAccContainerNodePool_withManagement(cluster, nodePool, management string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
 }
 
 resource "google_container_node_pool" "np_with_management" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
 
-  %s
+	%s
 
-  node_config {
-    machine_type = "g1-small"
-    disk_size_gb = 10
-    oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
-  }
-}
-`, cluster, nodePool, management)
+	node_config {
+		machine_type = "g1-small"
+		disk_size_gb = 10
+		oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
+	}
+}`, cluster, nodePool, management)
 }
 
 func testAccContainerNodePool_withNodeConfig(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 }
-
 resource "google_container_node_pool" "np_with_node_config" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-  node_config {
-    machine_type = "g1-small"
-    disk_size_gb = 10
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-    ]
-    preemptible      = true
-    min_cpu_platform = "Intel Broadwell"
-
-    taint {
-      key    = "taint_key"
-      value  = "taint_value"
-      effect = "PREFER_NO_SCHEDULE"
-    }
-
-    taint {
-      key    = "taint_key2"
-      value  = "taint_value2"
-      effect = "NO_EXECUTE"
-    }
-
-    // Updatable fields
-    image_type = "COS"
-  }
-}
-`, cluster, nodePool)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+	node_config {
+		machine_type = "g1-small"
+		disk_size_gb = 10
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write",
+			"https://www.googleapis.com/auth/monitoring"
+		]
+		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
+
+		taint {
+			key = "taint_key"
+			value = "taint_value"
+			effect = "PREFER_NO_SCHEDULE"
+		}
+
+		taint {
+			key = "taint_key2"
+			value = "taint_value2"
+			effect = "NO_EXECUTE"
+		}
+
+		// Updatable fields
+		image_type = "COS"
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerNodePool_withNodeConfigUpdate(cluster, nodePool string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 }
-
 resource "google_container_node_pool" "np_with_node_config" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-  node_config {
-    machine_type = "g1-small"
-    disk_size_gb = 10
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/compute",
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-    ]
-    preemptible      = true
-    min_cpu_platform = "Intel Broadwell"
-
-    taint {
-      key    = "taint_key"
-      value  = "taint_value"
-      effect = "PREFER_NO_SCHEDULE"
-    }
-
-    taint {
-      key    = "taint_key2"
-      value  = "taint_value2"
-      effect = "NO_EXECUTE"
-    }
-
-    // Updatable fields
-    image_type = "UBUNTU"
-  }
-}
-`, cluster, nodePool)
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+	node_config {
+		machine_type = "g1-small"
+		disk_size_gb = 10
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/compute",
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write",
+			"https://www.googleapis.com/auth/monitoring"
+		]
+		preemptible = true
+		min_cpu_platform = "Intel Broadwell"
+
+		taint {
+			key = "taint_key"
+			value = "taint_value"
+			effect = "PREFER_NO_SCHEDULE"
+		}
+
+		taint {
+			key = "taint_key2"
+			value = "taint_value2"
+			effect = "NO_EXECUTE"
+		}
+
+		// Updatable fields
+		image_type = "UBUNTU"
+	}
+}`, cluster, nodePool)
 }
 
 func testAccContainerNodePool_withGPU() string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1c" {
-  location = "us-central1-c"
+	location = "us-central1-c"
 }
 
 resource "google_container_cluster" "cluster" {
-  name               = "tf-cluster-nodepool-test-%s"
-  location           = "us-central1-c"
-  initial_node_count = 1
-  node_version       = data.google_container_engine_versions.central1c.latest_node_version
-  min_master_version = data.google_container_engine_versions.central1c.latest_master_version
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-c"
+	initial_node_count = 1
+	node_version = "${data.google_container_engine_versions.central1c.latest_node_version}"
+	min_master_version = "${data.google_container_engine_versions.central1c.latest_master_version}"
 }
 
 resource "google_container_node_pool" "np_with_gpu" {
-  name     = "tf-nodepool-test-%s"
-  location = "us-central1-c"
-  cluster  = google_container_cluster.cluster.name
-
-  initial_node_count = 1
-
-  node_config {
-    machine_type = "n1-standard-1"
-    disk_size_gb = 32
-
-    oauth_scopes = [
-      "https://www.googleapis.com/auth/devstorage.read_only",
-      "https://www.googleapis.com/auth/logging.write",
-      "https://www.googleapis.com/auth/monitoring",
-      "https://www.googleapis.com/auth/service.management.readonly",
-      "https://www.googleapis.com/auth/servicecontrol",
-      "https://www.googleapis.com/auth/trace.append",
-    ]
-
-    preemptible     = true
-    service_account = "default"
-    image_type      = "COS"
-
-    guest_accelerator {
-      type  = "nvidia-tesla-k80"
-      count = 1
-    }
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	name     = "tf-nodepool-test-%s"
+	location = "us-central1-c"
+	cluster = "${google_container_cluster.cluster.name}"
+
+	initial_node_count = 1
+
+	node_config {
+		machine_type = "n1-standard-1"
+		disk_size_gb = 32
+
+		oauth_scopes = [
+			"https://www.googleapis.com/auth/devstorage.read_only",
+			"https://www.googleapis.com/auth/logging.write",
+			"https://www.googleapis.com/auth/monitoring",
+			"https://www.googleapis.com/auth/service.management.readonly",
+			"https://www.googleapis.com/auth/servicecontrol",
+			"https://www.googleapis.com/auth/trace.append"
+		]
+
+		preemptible = true
+		service_account = "default"
+		image_type = "COS"
+
+		guest_accelerator {
+			type = "nvidia-tesla-k80"
+			count = 1
+		}
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccContainerNodePool_withNodeConfigScopeAlias() string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "tf-cluster-nodepool-test-%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name     = "tf-cluster-nodepool-test-%s"
+	location = "us-central1-a"
+	initial_node_count = 1
 }
-
 resource "google_container_node_pool" "np_with_node_config_scope_alias" {
-  name               = "tf-nodepool-test-%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-  node_config {
-    machine_type = "g1-small"
-    disk_size_gb = 10
-    oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
-  }
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	name = "tf-nodepool-test-%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+	node_config {
+		machine_type = "g1-small"
+		disk_size_gb = 10
+		oauth_scopes = ["compute-rw", "storage-ro", "logging-write", "monitoring"]
+	}
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccContainerNodePool_version(cluster, np string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-  min_master_version = data.google_container_engine_versions.central1a.latest_master_version
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	min_master_version = "${data.google_container_engine_versions.central1a.latest_master_version}"
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
 
-  version = data.google_container_engine_versions.central1a.valid_node_versions[1]
-}
-`, cluster, np)
+	version = "${data.google_container_engine_versions.central1a.valid_node_versions.1}"
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_updateVersion(cluster, np string) string {
 	return fmt.Sprintf(`
 data "google_container_engine_versions" "central1a" {
-  location = "us-central1-a"
+	location = "us-central1-a"
 }
 
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
-  min_master_version = data.google_container_engine_versions.central1a.latest_master_version
+	name     = "%s"
+	location = "us-central1-a"
+	initial_node_count = 1
+	min_master_version = "${data.google_container_engine_versions.central1a.latest_master_version}"
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
+	name     = "%s"
+	location = "us-central1-a"
+	cluster = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
 
-  version = data.google_container_engine_versions.central1a.valid_node_versions[0]
-}
-`, cluster, np)
+	version = "${data.google_container_engine_versions.central1a.valid_node_versions.0}"
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_012_ConfigModeAttr1(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-f"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-f"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-
-  node_config {
-    guest_accelerator {
-      count = 1
-      type  = "nvidia-tesla-p100"
-    }
-  }
-}
-`, cluster, np)
+	name               = "%s"
+	location           = "us-central1-f"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+
+	node_config {
+		guest_accelerator {
+			count = 1
+			type  = "nvidia-tesla-p100"
+		}
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_012_ConfigModeAttr2(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-f"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-f"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-f"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
 
-  node_config {
-    guest_accelerator = []
-  }
-}
-`, cluster, np)
+	node_config {
+		guest_accelerator = []
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_EmptyGuestAccelerator(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-f"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-f"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-
-  node_config {
-    guest_accelerator {
-      count = 0
-      type  = "nvidia-tesla-p100"
-    }
-  }
-}
-`, cluster, np)
+	name               = "%s"
+	location           = "us-central1-f"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+
+	node_config {
+		guest_accelerator {
+			count = 0
+			type  = "nvidia-tesla-p100"
+		}
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_PartialEmptyGuestAccelerator(cluster, np string, count int) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-f"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-f"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-
-  node_config {
-    guest_accelerator {
-      count = 0
-      type  = "nvidia-tesla-p100"
-    }
+	name               = "%s"
+	location           = "us-central1-f"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+
+	node_config {
+		guest_accelerator {
+			count = 0
+			type  = "nvidia-tesla-p100"
+		}
 
-    guest_accelerator {
-      count = %d
-      type  = "nvidia-tesla-p100"
-    }
-  }
-}
-`, cluster, np, count)
+		guest_accelerator {
+			count = %d
+			type  = "nvidia-tesla-p100"
+		}
+	}
+}`, cluster, np, count)
 }
 
 func testAccContainerNodePool_PartialEmptyGuestAccelerator2(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-f"
-  initial_node_count = 3
+	name               = "%s"
+	location           = "us-central1-f"
+	initial_node_count = 3
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-f"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 1
-
-  node_config {
-    guest_accelerator {
-      count = 0
-      type  = "nvidia-tesla-p100"
-    }
+	name               = "%s"
+	location           = "us-central1-f"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 1
+
+	node_config {
+		guest_accelerator {
+			count = 0
+			type  = "nvidia-tesla-p100"
+		}
 
-    guest_accelerator {
-      count = 1
-      type  = "nvidia-tesla-p100"
-    }
+		guest_accelerator {
+			count = 1
+			type  = "nvidia-tesla-p100"
+		}
 
-    guest_accelerator {
-      count = 1
-      type  = "nvidia-tesla-p9000"
-    }
-  }
-}
-`, cluster, np)
+		guest_accelerator {
+			count = 1
+			type  = "nvidia-tesla-p9000"
+		}
+	}
+}`, cluster, np)
 }
 
 func testAccContainerNodePool_shieldedInstanceConfig(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
-  name               = "%s"
-  location           = "us-central1-a"
-  initial_node_count = 1
+	name               = "%s"
+	location           = "us-central1-a"
+	initial_node_count = 1
 }
 
 resource "google_container_node_pool" "np" {
-  name               = "%s"
-  location           = "us-central1-a"
-  cluster            = google_container_cluster.cluster.name
-  initial_node_count = 2
-  node_config {
-    shielded_instance_config {
-      enable_integrity_monitoring = true
-      enable_secure_boot          = true
-    }
-  }
-}
-`, cluster, np)
+	name               = "%s"
+	location           = "us-central1-a"
+	cluster            = "${google_container_cluster.cluster.name}"
+	initial_node_count = 2
+	node_config {
+		shielded_instance_config {
+			enable_integrity_monitoring = true
+			enable_secure_boot          = true
+		}
+	}
+}`, cluster, np)
 }
diff --git a/google/resource_dataflow_job_test.go b/google/resource_dataflow_job_test.go
index 4aa90dea258..ae38eeb8d63 100644
--- a/google/resource_dataflow_job_test.go
+++ b/google/resource_dataflow_job_test.go
@@ -387,125 +387,121 @@ func testAccDataflowJobHasLabels(n, key string) resource.TestCheckFunc {
 
 var testAccDataflowJob = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
-  machine_type      = "n1-standard-2"
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
+	machine_type = "n1-standard-2"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  zone    = "us-central1-f"
-  project = "%s"
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
+	zone = "us-central1-f"
+	project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 var testAccDataflowJobRegion = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  region  = "us-central1"
-  zone    = "us-central1-c"
-  project = "%s"
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
+	region  = "us-central1"
+	zone    = "us-central1-c"
+	project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 var testAccDataflowJobWithNetwork = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_compute_network" "net" {
-  name                    = "dfjob-test-%s-net"
-  auto_create_subnetworks = true
+	name = "dfjob-test-%s-net"
+	auto_create_subnetworks = true
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
-  network           = google_compute_network.net.name
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
+	network = "${google_compute_network.net.name}"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  zone    = "us-central1-f"
-  project = "%s"
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
+	zone = "us-central1-f"
+	project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 var testAccDataflowJobWithSubnetwork = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_compute_network" "net" {
-  name                    = "dfjob-test-%s-net"
-  auto_create_subnetworks = false
+	name = "dfjob-test-%s-net"
+	auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "subnet" {
-  name          = "dfjob-test-%s-subnet"
-  ip_cidr_range = "10.2.0.0/16"
-  network       = google_compute_network.net.self_link
+	name = "dfjob-test-%s-subnet"
+	ip_cidr_range = "10.2.0.0/16"
+	network = "${google_compute_network.net.self_link}"
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
-  subnetwork        = google_compute_subnetwork.subnet.self_link
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
+	subnetwork = "${google_compute_subnetwork.subnet.self_link}"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  zone    = "us-central1-f"
-  project = "%s"
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
+	zone = "us-central1-f"
+	project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 var testAccDataflowJobWithServiceAccount = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_service_account" "dataflow-sa" {
@@ -514,7 +510,7 @@ resource "google_service_account" "dataflow-sa" {
 }
 
 resource "google_storage_bucket_iam_member" "dataflow-gcs" {
-  bucket = google_storage_bucket.temp.name
+  bucket = "${google_storage_bucket.temp.name}"
   role   = "roles/storage.objectAdmin"
   member = "serviceAccount:${google_service_account.dataflow-sa.email}"
 }
@@ -525,77 +521,74 @@ resource "google_project_iam_member" "dataflow-worker" {
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  zone                  = "us-central1-f"
-  project               = "%s"
-  service_account_email = google_service_account.dataflow-sa.email
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
+	zone = "us-central1-f"
+	project = "%s"
+	service_account_email = "${google_service_account.dataflow-sa.email}"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 var testAccDataflowJobWithIpConfig = fmt.Sprintf(`
 resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	name = "dfjob-test-%s-temp"
 
-  force_destroy = true
+	force_destroy = true
 }
 
 resource "google_dataflow_job" "big_data" {
-  name = "dfjob-test-%s"
+	name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
-  machine_type      = "n1-standard-2"
+	template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+	temp_gcs_location = "${google_storage_bucket.temp.url}"
+	machine_type = "n1-standard-2"
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
+	parameters = {
+		inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+		output    = "${google_storage_bucket.temp.url}/output"
+	}
 
-  ip_configuration = "WORKER_IP_PRIVATE"
+	ip_configuration = "WORKER_IP_PRIVATE"
 
-  zone    = "us-central1-f"
-  project = "%s"
+	zone = "us-central1-f"
+	project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+	on_delete = "cancel"
+}`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 
 func testAccDataflowJobWithLabels(key string) string {
 	return fmt.Sprintf(`
-resource "google_storage_bucket" "temp" {
-  name = "dfjob-test-%s-temp"
+	resource "google_storage_bucket" "temp" {
+		name = "dfjob-test-%s-temp"
 
-  force_destroy = true
-}
+		force_destroy = true
+	}
 
-resource "google_dataflow_job" "with_labels" {
-  name = "dfjob-test-%s"
+	resource "google_dataflow_job" "with_labels" {
+		name = "dfjob-test-%s"
 
-  template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
-  temp_gcs_location = google_storage_bucket.temp.url
+		template_gcs_path = "gs://dataflow-templates/wordcount/template_file"
+		temp_gcs_location = "${google_storage_bucket.temp.url}"
 
-  labels = {
-    "my-label" = "test"
-  }
+		labels = {
+			"my-label" = "test"
+		}
 
-  parameters = {
-    inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
-    output    = "${google_storage_bucket.temp.url}/output"
-  }
-  zone    = "us-central1-f"
-  project = "%s"
+		parameters = {
+			inputFile = "gs://dataflow-samples/shakespeare/kinglear.txt"
+			output    = "${google_storage_bucket.temp.url}/output"
+		}
+		zone = "us-central1-f"
+		project = "%s"
 
-  on_delete = "cancel"
-}
-`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
+		on_delete = "cancel"
+	}`, acctest.RandString(10), acctest.RandString(10), getTestProjectFromEnv())
 }
diff --git a/google/resource_dataproc_cluster_iam_test.go b/google/resource_dataproc_cluster_iam_test.go
index 01f4b5505f9..c2a8baee6fc 100644
--- a/google/resource_dataproc_cluster_iam_test.go
+++ b/google/resource_dataproc_cluster_iam_test.go
@@ -118,6 +118,7 @@ func TestAccDataprocClusterIamPolicy(t *testing.T) {
 
 func testAccDataprocClusterIamBinding_basic(cluster, account, role string) string {
 	return fmt.Sprintf(testDataprocIamSingleNodeCluster+`
+
 resource "google_service_account" "test-account1" {
   account_id   = "%s-1"
   display_name = "Dataproc Cluster IAM Testing Account"
@@ -129,10 +130,10 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_dataproc_cluster_iam_binding" "binding" {
-  cluster = google_dataproc_cluster.cluster.name
-  region  = "us-central1"
-  role    = "%s"
-  members = [
+  cluster      = "${google_dataproc_cluster.cluster.name}"
+  region 	   = "us-central1"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
   ]
 }
@@ -152,10 +153,10 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_dataproc_cluster_iam_binding" "binding" {
-  cluster = google_dataproc_cluster.cluster.name
-  region  = "us-central1"
-  role    = "%s"
-  members = [
+  cluster      = "${google_dataproc_cluster.cluster.name}"
+  region 	   = "us-central1"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
     "serviceAccount:${google_service_account.test-account2.email}",
   ]
@@ -171,9 +172,9 @@ resource "google_service_account" "test-account" {
 }
 
 resource "google_dataproc_cluster_iam_member" "member" {
-  cluster = google_dataproc_cluster.cluster.name
-  role    = "%s"
-  member  = "serviceAccount:${google_service_account.test-account.email}"
+  cluster      = "${google_dataproc_cluster.cluster.name}"
+  role         = "%s"
+  member       = "serviceAccount:${google_service_account.test-account.email}"
 }
 `, cluster, account, role)
 }
@@ -186,16 +187,16 @@ resource "google_service_account" "test-account" {
 }
 
 data "google_iam_policy" "policy" {
-  binding {
-    role    = "%s"
-    members = ["serviceAccount:${google_service_account.test-account.email}"]
-  }
+	binding {
+		role    = "%s"
+		members = ["serviceAccount:${google_service_account.test-account.email}"]
+	}
 }
 
 resource "google_dataproc_cluster_iam_policy" "policy" {
-  cluster     = google_dataproc_cluster.cluster.name
-  region      = "us-central1"
-  policy_data = data.google_iam_policy.policy.policy_data
+  cluster      = "${google_dataproc_cluster.cluster.name}"
+  region 	   = "us-central1"
+  policy_data  = "${data.google_iam_policy.policy.policy_data}"
 }
 `, cluster, account, role)
 }
@@ -203,23 +204,23 @@ resource "google_dataproc_cluster_iam_policy" "policy" {
 // Smallest cluster possible for testing
 var testDataprocIamSingleNodeCluster = `
 resource "google_dataproc_cluster" "cluster" {
-  name   = "%s"
-  region = "us-central1"
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      num_instances = 1
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-  }
+	name                  = "%s"
+	region                = "us-central1"
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			num_instances     = 1
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+	}
 }`
diff --git a/google/resource_dataproc_cluster_test.go b/google/resource_dataproc_cluster_test.go
index 57f9227a736..70753fcec3f 100644
--- a/google/resource_dataproc_cluster_test.go
+++ b/google/resource_dataproc_cluster_test.go
@@ -803,8 +803,8 @@ func testAccCheckDataprocClusterExists(n string, cluster *dataproc.Cluster) reso
 func testAccCheckDataproc_missingZoneGlobalRegion1(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "basic" {
-  name   = "dproc-cluster-test-%s"
-  region = "global"
+	name                  = "dproc-cluster-test-%s"
+	region                = "global"
 }
 `, rnd)
 }
@@ -812,14 +812,14 @@ resource "google_dataproc_cluster" "basic" {
 func testAccCheckDataproc_missingZoneGlobalRegion2(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "basic" {
-  name   = "dproc-cluster-test-%s"
-  region = "global"
+	name                  = "dproc-cluster-test-%s"
+	region                = "global"
 
-  cluster_config {
-    gce_cluster_config {
-      network = "default"
-    }
-  }
+	cluster_config {
+		gce_cluster_config {
+			network = "default"
+		}
+	}
 }
 `, rnd)
 }
@@ -827,8 +827,8 @@ resource "google_dataproc_cluster" "basic" {
 func testAccDataprocCluster_basic(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "basic" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
+	name                  = "dproc-cluster-test-%s"
+	region                = "us-central1"
 }
 `, rnd)
 }
@@ -836,41 +836,41 @@ resource "google_dataproc_cluster" "basic" {
 func testAccDataprocCluster_withAccelerators(rnd, zone, acceleratorType string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "accelerated_cluster" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    gce_cluster_config {
-      zone = "%s"
-    }
-
-    master_config {
-      accelerators {
-        accelerator_type  = "%s"
-        accelerator_count = "1"
-      }
-    }
-
-    worker_config {
-      accelerators {
-        accelerator_type  = "%s"
-        accelerator_count = "1"
-      }
-    }
-  }
+	name                  = "dproc-cluster-test-%s"
+	region                = "us-central1"
+
+	cluster_config {
+		gce_cluster_config {
+			zone = "%s"
+		}
+
+		master_config {
+			accelerators {
+				accelerator_type  = "%s"
+				accelerator_count = "1"
+			}
+		}
+
+		worker_config {
+			accelerators {
+				accelerator_type  = "%s"
+				accelerator_count = "1"
+			}
+		}
+	}
 }
 `, rnd, zone, acceleratorType, acceleratorType)
 }
 
 func testAccDataprocCluster_withInternalIpOnlyTrue(rnd string) string {
 	return fmt.Sprintf(`
-variable "subnetwork_cidr" {
-  default = "10.0.0.0/16"
+variable subnetwork_cidr {
+	default = "10.0.0.0/16"
 }
 
 resource "google_compute_network" "dataproc_network" {
-  name                    = "dataproc-internalip-network-%s"
-  auto_create_subnetworks = false
+	name = "dataproc-internalip-network-%s"
+	auto_create_subnetworks = false
 }
 
 #
@@ -878,12 +878,12 @@ resource "google_compute_network" "dataproc_network" {
 # deploying a Dataproc cluster with Internal IP Only enabled.
 #
 resource "google_compute_subnetwork" "dataproc_subnetwork" {
-  name                     = "dataproc-internalip-subnetwork-%s"
-  ip_cidr_range            = var.subnetwork_cidr
-  network                  = google_compute_network.dataproc_network.self_link
-  region                   = "us-central1"
-  private_ip_google_access = true
-}
+	name                     = "dataproc-internalip-subnetwork-%s"
+	ip_cidr_range            = "${var.subnetwork_cidr}"
+	network                  = "${google_compute_network.dataproc_network.self_link}"
+	region                   = "us-central1"
+	private_ip_google_access = true
+  }
 
 #
 # The default network within GCP already comes pre configured with
@@ -893,38 +893,37 @@ resource "google_compute_subnetwork" "dataproc_subnetwork" {
 # internally as part of their configuration or this will just hang.
 #
 resource "google_compute_firewall" "dataproc_network_firewall" {
-  name        = "dproc-cluster-test-allow-internal"
-  description = "Firewall rules for dataproc Terraform acceptance testing"
-  network     = google_compute_network.dataproc_network.name
+	name = "dproc-cluster-test-allow-internal"
+	description = "Firewall rules for dataproc Terraform acceptance testing"
+	network = "${google_compute_network.dataproc_network.name}"
 
-  allow {
-    protocol = "icmp"
-  }
+	allow {
+		protocol = "icmp"
+	}
 
-  allow {
-    protocol = "tcp"
-    ports    = ["0-65535"]
-  }
+	allow {
+		protocol = "tcp"
+		ports    = ["0-65535"]
+	}
 
-  allow {
-    protocol = "udp"
-    ports    = ["0-65535"]
-  }
+	allow {
+		protocol = "udp"
+		ports    = ["0-65535"]
+	}
 
-  source_ranges = [var.subnetwork_cidr]
+	source_ranges = ["${var.subnetwork_cidr}"]
 }
-
 resource "google_dataproc_cluster" "basic" {
-  name       = "dproc-cluster-test-%s"
-  region     = "us-central1"
-  depends_on = [google_compute_firewall.dataproc_network_firewall]
-
-  cluster_config {
-    gce_cluster_config {
-      subnetwork       = google_compute_subnetwork.dataproc_subnetwork.name
-      internal_ip_only = true
-    }
-  }
+	name                  = "dproc-cluster-test-%s"
+	region                = "us-central1"
+	depends_on            = ["google_compute_firewall.dataproc_network_firewall"]
+
+	cluster_config {
+		gce_cluster_config {
+			subnetwork       = "${google_compute_subnetwork.dataproc_subnetwork.name}"
+			internal_ip_only = true
+		}
+	}
 }
 `, rnd, rnd, rnd)
 }
@@ -932,18 +931,18 @@ resource "google_dataproc_cluster" "basic" {
 func testAccDataprocCluster_withMetadataAndTags(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "basic" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    gce_cluster_config {
-      metadata = {
-        foo = "bar"
-        baz = "qux"
-      }
-      tags = ["my-tag", "your-tag", "our-tag", "their-tag"]
-    }
-  }
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+		gce_cluster_config {
+			metadata = {
+				foo = "bar"
+				baz = "qux"
+			}
+			tags = ["my-tag", "your-tag", "our-tag", "their-tag"]
+		}
+	}
 }
 `, rnd)
 }
@@ -951,17 +950,17 @@ resource "google_dataproc_cluster" "basic" {
 func testAccDataprocCluster_singleNodeCluster(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "single_node_cluster" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-  }
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+	}
 }
 `, rnd)
 }
@@ -969,54 +968,53 @@ resource "google_dataproc_cluster" "single_node_cluster" {
 func testAccDataprocCluster_withConfigOverrides(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "with_config_overrides" {
-  name     = "dproc-cluster-test-%s"
-  region   = "us-central1"
-
-  cluster_config {
-    master_config {
-      num_instances = 3
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_type    = "pd-ssd"
-        boot_disk_size_gb = 15
-      }
-    }
-
-    worker_config {
-      num_instances = 3
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_type    = "pd-standard"
-        boot_disk_size_gb = 16
-        num_local_ssds    = 1
-      }
-
-    }
-
-    preemptible_worker_config {
-      num_instances = 1
-      disk_config {
-        boot_disk_type    = "pd-ssd"
-        boot_disk_size_gb = 17
-        num_local_ssds    = 1
-      }
-    }
-  }
-}
-`, rnd)
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+
+		master_config {
+			num_instances     = 3
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_type    = "pd-ssd"
+				boot_disk_size_gb = 15
+			}
+		}
+
+		worker_config {
+			num_instances     = 3
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_type    = "pd-standard"
+				boot_disk_size_gb = 16
+				num_local_ssds    = 1
+			}
+		}
+
+		preemptible_worker_config {
+			num_instances     = 1
+			disk_config {
+				boot_disk_type    = "pd-ssd"
+				boot_disk_size_gb = 17
+				num_local_ssds    = 1
+			}
+		}
+	}
+}`, rnd)
 }
 
 func testAccDataprocCluster_withInitAction(rnd, bucket, objName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "init_bucket" {
-  name          = "%s"
-  force_destroy = "true"
+	name          = "%s"
+	force_destroy = "true"
 }
 
 resource "google_storage_bucket_object" "init_script" {
-  name    = "dproc-cluster-test-%s-init-script.sh"
-  bucket  = google_storage_bucket.init_bucket.name
-  content = <<EOL
+	name           = "dproc-cluster-test-%s-init-script.sh"
+	bucket         = "${google_storage_bucket.init_bucket.name}"
+	content        = <<EOL
 #!/bin/bash
 echo "init action success" >> /tmp/%s
 gsutil cp /tmp/%s ${google_storage_bucket.init_bucket.url}
@@ -1025,77 +1023,76 @@ EOL
 }
 
 resource "google_dataproc_cluster" "with_init_action" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      machine_type = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    initialization_action {
-      script      = "${google_storage_bucket.init_bucket.url}/${google_storage_bucket_object.init_script.name}"
-      timeout_sec = 500
-    }
-    initialization_action {
-      script = "${google_storage_bucket.init_bucket.url}/${google_storage_bucket_object.init_script.name}"
-    }
-  }
-}
-`, bucket, rnd, objName, objName, rnd)
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		initialization_action {
+			script      = "${google_storage_bucket.init_bucket.url}/${google_storage_bucket_object.init_script.name}"
+			timeout_sec = 500
+		}
+		initialization_action {
+			script      = "${google_storage_bucket.init_bucket.url}/${google_storage_bucket_object.init_script.name}"
+		}
+	}
+}`, bucket, rnd, objName, objName, rnd)
 }
 
 func testAccDataprocCluster_updatable(rnd string, w, p int) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "updatable" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    master_config {
-      num_instances = "1"
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    worker_config {
-      num_instances = "%d"
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    preemptible_worker_config {
-      num_instances = "%d"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-  }
-}
-`, rnd, w, p)
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+
+		master_config {
+			num_instances      = "1"
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		worker_config {
+			num_instances      = "%d"
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		preemptible_worker_config {
+			num_instances      = "%d"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+	}
+
+}`, rnd, w, p)
 }
 
 func testAccDataprocCluster_withStagingBucketOnly(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  force_destroy = "true"
-}
-`, bucketName)
+	name          = "%s"
+	force_destroy = "true"
+}`, bucketName)
 }
 
 func testAccDataprocCluster_withStagingBucketAndCluster(clusterName, bucketName string) string {
@@ -1103,136 +1100,132 @@ func testAccDataprocCluster_withStagingBucketAndCluster(clusterName, bucketName
 %s
 
 resource "google_dataproc_cluster" "with_bucket" {
-  name   = "%s"
-  region = "us-central1"
-
-  cluster_config {
-    staging_bucket = google_storage_bucket.bucket.name
-
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      machine_type = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-  }
-}
-`, testAccDataprocCluster_withStagingBucketOnly(bucketName), clusterName)
+	name   = "%s"
+	region = "us-central1"
+
+	cluster_config {
+		staging_bucket = "${google_storage_bucket.bucket.name}"
+
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+	}
+}`, testAccDataprocCluster_withStagingBucketOnly(bucketName), clusterName)
 }
 
 func testAccDataprocCluster_withLabels(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "with_labels" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
 
-  labels = {
-    key1 = "value1"
-  }
+	labels = {
+		key1 = "value1"
+	}
 
-  # This is because GCP automatically adds its own labels as well.
-  # In this case we just want to test our newly added label is there
-  lifecycle {
-    ignore_changes = [labels]
-  }
-}
-`, rnd)
+	# This is because GCP automatically adds its own labels as well.
+	# In this case we just want to test our newly added label is there
+	lifecycle {
+	    ignore_changes = ["labels"]
+	}
+
+}`, rnd)
 }
 
 func testAccDataprocCluster_withImageVersion(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "with_image_version" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
 
-  cluster_config {
-    software_config {
-      image_version = "1.3.7-deb9"
-    }
-  }
-}
-`, rnd)
+	cluster_config {
+		software_config {
+			image_version = "1.3.7-deb9"
+		}
+	}
+}`, rnd)
 }
 
 func testAccDataprocCluster_withOptionalComponents(rnd string) string {
 	return fmt.Sprintf(`
 resource "google_dataproc_cluster" "with_opt_components" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
 
-  cluster_config {
-    software_config {
-      optional_components = ["ANACONDA", "ZOOKEEPER"]
-    }
-  }
-}
-`, rnd)
+	cluster_config {
+		software_config {
+			optional_components = ["ANACONDA", "ZOOKEEPER"]
+		}
+	}
+}`, rnd)
 }
 
 func testAccDataprocCluster_withServiceAcc(sa string, rnd string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "service_account" {
-  account_id = "%s"
+	account_id = "%s"
 }
 
 resource "google_project_iam_member" "service_account" {
-  role   = "roles/dataproc.worker"
-  member = "serviceAccount:${google_service_account.service_account.email}"
+	role = "roles/dataproc.worker"
+	member = "serviceAccount:${google_service_account.service_account.email}"
 }
 
 resource "google_dataproc_cluster" "with_service_account" {
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      machine_type = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    gce_cluster_config {
-      service_account = google_service_account.service_account.email
-      service_account_scopes = [
-		#	User supplied scopes
-        "https://www.googleapis.com/auth/monitoring",
-		#	The following scopes necessary for the cluster to function properly are
-		#	always added, even if not explicitly specified:
-		#		useraccounts-ro: https://www.googleapis.com/auth/cloud.useraccounts.readonly
-		#		storage-rw:      https://www.googleapis.com/auth/devstorage.read_write
-		#		logging-write:   https://www.googleapis.com/auth/logging.write
-        "useraccounts-ro",
-        "storage-rw",
-        "logging-write",
-      ]
-    }
-  }
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
 
-  depends_on = [google_project_iam_member.service_account]
-}
-`, sa, rnd)
+		master_config {
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		gce_cluster_config {
+			service_account = "${google_service_account.service_account.email}"
+			service_account_scopes = [
+				#	User supplied scopes
+				"https://www.googleapis.com/auth/monitoring",
+
+				#	The following scopes necessary for the cluster to function properly are
+				#	always added, even if not explicitly specified:
+				#		useraccounts-ro: https://www.googleapis.com/auth/cloud.useraccounts.readonly
+				#		storage-rw:      https://www.googleapis.com/auth/devstorage.read_write
+				#		logging-write:   https://www.googleapis.com/auth/logging.write
+				"useraccounts-ro","storage-rw","logging-write"
+			]
+		}
+	}
+
+	depends_on = ["google_project_iam_member.service_account"]
+
+}`, sa, rnd)
 }
 
 func testAccDataprocCluster_withNetworkRefs(rnd, netName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "dataproc_network" {
-  name                    = "%s"
-  auto_create_subnetworks = true
+	name = "%s"
+	auto_create_subnetworks = true
 }
 
 #
@@ -1243,103 +1236,103 @@ resource "google_compute_network" "dataproc_network" {
 # internally as part of their configuration or this will just hang.
 #
 resource "google_compute_firewall" "dataproc_network_firewall" {
-  name          = "dproc-cluster-test-%s-allow-internal"
-  description   = "Firewall rules for dataproc Terraform acceptance testing"
-  network       = google_compute_network.dataproc_network.name
-  source_ranges = ["192.168.0.0/16"]
+	name = "dproc-cluster-test-%s-allow-internal"
+	description = "Firewall rules for dataproc Terraform acceptance testing"
+	network = "${google_compute_network.dataproc_network.name}"
+	source_ranges = ["192.168.0.0/16"]
 
-  allow {
-    protocol = "icmp"
-  }
+	allow {
+		protocol = "icmp"
+	}
 
-  allow {
-    protocol = "tcp"
-    ports    = ["0-65535"]
-  }
+	allow {
+		protocol = "tcp"
+		ports    = ["0-65535"]
+	}
 
-  allow {
-    protocol = "udp"
-    ports    = ["0-65535"]
-  }
+	allow {
+		protocol = "udp"
+		ports    = ["0-65535"]
+	}
 }
 
 resource "google_dataproc_cluster" "with_net_ref_by_name" {
-  name       = "dproc-cluster-test-%s-name"
-  region     = "us-central1"
-  depends_on = [google_compute_firewall.dataproc_network_firewall]
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      machine_type = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    gce_cluster_config {
-      network = google_compute_network.dataproc_network.name
-    }
-  }
+	name   = "dproc-cluster-test-%s-name"
+	region = "us-central1"
+	depends_on = ["google_compute_firewall.dataproc_network_firewall"]
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		gce_cluster_config {
+			network = "${google_compute_network.dataproc_network.name}"
+		}
+	}
 }
 
 resource "google_dataproc_cluster" "with_net_ref_by_url" {
-  name       = "dproc-cluster-test-%s-url"
-  region     = "us-central1"
-  depends_on = [google_compute_firewall.dataproc_network_firewall]
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      machine_type = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-
-    gce_cluster_config {
-      network = google_compute_network.dataproc_network.self_link
-    }
-  }
+	name   = "dproc-cluster-test-%s-url"
+	region = "us-central1"
+	depends_on = ["google_compute_firewall.dataproc_network_firewall"]
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+
+		gce_cluster_config {
+			network = "${google_compute_network.dataproc_network.self_link}"
+		}
+	}
 }
+
 `, netName, rnd, rnd, rnd)
 }
 
 func testAccDataprocCluster_KMS(pid, rnd, kmsKey string) string {
 	return fmt.Sprintf(`
 data "google_project" "project" {
-  project_id = "%s"
+	project_id = "%s"
 }
 
 resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
-  role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
-  member  = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
+  project = "${data.google_project.project.project_id}"
+	role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
+	member  = "serviceAccount:service-${data.google_project.project.number}@compute-system.iam.gserviceaccount.com"
 }
 
 resource "google_dataproc_cluster" "kms" {
-  depends_on = [google_project_iam_member.kms-project-binding]
+	depends_on = [google_project_iam_member.kms-project-binding]
 
-  name   = "dproc-cluster-test-%s"
-  region = "us-central1"
+	name   = "dproc-cluster-test-%s"
+	region = "us-central1"
 
-  cluster_config {
-    encryption_config {
-      kms_key_name = "%s"
-    }
-  }
-}
-`, pid, rnd, kmsKey)
+	cluster_config {
+		encryption_config {
+			kms_key_name = "%s"
+		}
+	}
+}`, pid, rnd, kmsKey)
 }
diff --git a/google/resource_dataproc_job_iam_test.go b/google/resource_dataproc_job_iam_test.go
index 98821d272ea..b1920ed9b2c 100644
--- a/google/resource_dataproc_job_iam_test.go
+++ b/google/resource_dataproc_job_iam_test.go
@@ -111,29 +111,29 @@ func TestAccDataprocJobIamPolicy(t *testing.T) {
 
 var testDataprocIamJobConfig = testDataprocIamSingleNodeCluster + `
 resource "google_dataproc_job" "pyspark" {
-  region = google_dataproc_cluster.cluster.region
-
-  placement {
-    cluster_name = google_dataproc_cluster.cluster.name
-  }
-
-  reference {
-    job_id = "%s"
-  }
-
-  force_delete = true
-
-  pyspark_config {
-    main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
-    properties = {
-      "spark.logConf" = "true"
-    }
-    logging_config {
-      driver_log_levels = {
-        "root" = "INFO"
-      }
-    }
-  }
+	region       = "${google_dataproc_cluster.cluster.region}"
+
+	placement {
+		cluster_name = "${google_dataproc_cluster.cluster.name}"
+	}
+
+	reference {
+		job_id = "%s"
+	}
+
+	force_delete = true
+
+	pyspark_config {
+		main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
+		properties = {
+			"spark.logConf" = "true"
+		}
+		logging_config {
+			driver_log_levels = {
+				"root" = "INFO"
+			}
+		}
+	}
 }
 `
 
@@ -150,13 +150,14 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_dataproc_job_iam_binding" "binding" {
-  job_id = google_dataproc_job.pyspark.reference[0].job_id
-  region = "us-central1"
-  role   = "%s"
-  members = [
+  job_id      = "${google_dataproc_job.pyspark.reference.0.job_id}"
+  region 	   = "us-central1"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
   ]
 }
+
 `, cluster, job, account, account, role)
 }
 
@@ -173,10 +174,10 @@ resource "google_service_account" "test-account2" {
 }
 
 resource "google_dataproc_job_iam_binding" "binding" {
-  job_id = google_dataproc_job.pyspark.reference[0].job_id
-  region = "us-central1"
-  role   = "%s"
-  members = [
+  job_id      = "${google_dataproc_job.pyspark.reference.0.job_id}"
+  region 	   = "us-central1"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test-account1.email}",
     "serviceAccount:${google_service_account.test-account2.email}",
   ]
@@ -192,9 +193,9 @@ resource "google_service_account" "test-account" {
 }
 
 resource "google_dataproc_job_iam_member" "member" {
-  job_id = google_dataproc_job.pyspark.reference[0].job_id
-  role   = "%s"
-  member = "serviceAccount:${google_service_account.test-account.email}"
+  job_id      = "${google_dataproc_job.pyspark.reference.0.job_id}"
+  role         = "%s"
+  member       = "serviceAccount:${google_service_account.test-account.email}"
 }
 `, cluster, job, account, role)
 }
@@ -207,16 +208,16 @@ resource "google_service_account" "test-account" {
 }
 
 data "google_iam_policy" "policy" {
-  binding {
-    role    = "%s"
-    members = ["serviceAccount:${google_service_account.test-account.email}"]
-  }
+	binding {
+		role    = "%s"
+		members = ["serviceAccount:${google_service_account.test-account.email}"]
+	}
 }
 
 resource "google_dataproc_job_iam_policy" "policy" {
-  job_id      = google_dataproc_job.pyspark.reference[0].job_id
-  region      = "us-central1"
-  policy_data = data.google_iam_policy.policy.policy_data
+  job_id      = "${google_dataproc_job.pyspark.reference.0.job_id}"
+  region 	   = "us-central1"
+  policy_data  = "${data.google_iam_policy.policy.policy_data}"
 }
 `, cluster, job, account, role)
 }
diff --git a/google/resource_dataproc_job_test.go b/google/resource_dataproc_job_test.go
index 4fdb85cf081..b9f8bb04dff 100644
--- a/google/resource_dataproc_job_test.go
+++ b/google/resource_dataproc_job_test.go
@@ -487,45 +487,47 @@ func testAccCheckDataprocJobAttrMatch(n, jobType string, job *dataproc.Job) reso
 
 var singleNodeClusterConfig = `
 resource "google_dataproc_cluster" "basic" {
-  name   = "dproc-job-test-%s"
-  region = "us-central1"
-
-  cluster_config {
-    # Keep the costs down with smallest config we can get away with
-    software_config {
-      override_properties = {
-        "dataproc:dataproc.allow.zero.workers" = "true"
-      }
-    }
-
-    master_config {
-      num_instances = 1
-      machine_type  = "n1-standard-1"
-      disk_config {
-        boot_disk_size_gb = 15
-      }
-    }
-  }
+	name                  = "dproc-job-test-%s"
+	region                = "us-central1"
+
+	cluster_config {
+		# Keep the costs down with smallest config we can get away with
+		software_config {
+			override_properties = {
+				"dataproc:dataproc.allow.zero.workers" = "true"
+			}
+		}
+
+		master_config {
+			num_instances     = 1
+			machine_type      = "n1-standard-1"
+			disk_config {
+				boot_disk_size_gb = 15
+			}
+		}
+	}
 }
 `
 
 func testAccDataprocJob_updatable(rnd, jobId, del string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
+
 resource "google_dataproc_job" "updatable" {
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-  reference {
-    job_id = "%s"
-  }
-
-  region       = google_dataproc_cluster.basic.region
-  force_delete = %s
-
-  pyspark_config {
-    main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
-  }
+
+	placement {
+		cluster_name = "${google_dataproc_cluster.basic.name}"
+	}
+	reference {
+		job_id = "%s"
+	}
+
+	region       = "${google_dataproc_cluster.basic.region}"
+	force_delete = %s
+
+	pyspark_config {
+		main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
+	}
 }
 `, rnd, jobId, del)
 }
@@ -533,36 +535,38 @@ resource "google_dataproc_job" "updatable" {
 func testAccDataprocJob_pySpark(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
+
 resource "google_dataproc_job" "pyspark" {
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-  reference {
-    job_id = "dproc-custom-job-id-%s"
-  }
-
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-
-  pyspark_config {
-    main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
-    properties = {
-      "spark.logConf" = "true"
-    }
-    logging_config {
-      driver_log_levels = {
-        "root" = "INFO"
-      }
-    }
-  }
-
-  scheduling {
-    max_failures_per_hour = 1
-  }
-
-  labels = {
-    one = "1"
-  }
+
+	placement {
+		cluster_name = "${google_dataproc_cluster.basic.name}"
+	}
+	reference {
+		job_id = "dproc-custom-job-id-%s"
+	}
+
+	region       = "${google_dataproc_cluster.basic.region}"
+	force_delete = true
+
+	pyspark_config {
+		main_python_file_uri = "gs://dataproc-examples-2f10d78d114f6aaec76462e3c310f31f/src/pyspark/hello-world/hello-world.py"
+		properties = {
+			"spark.logConf" = "true"
+		}
+		logging_config {
+			driver_log_levels = {
+				"root" = "INFO"
+			}
+		}
+	}
+
+	scheduling {
+		max_failures_per_hour = 1
+	}
+
+	labels = {
+		one = "1"
+	}
 }
 `, rnd, rnd)
 }
@@ -570,113 +574,125 @@ resource "google_dataproc_job" "pyspark" {
 func testAccDataprocJob_spark(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
-resource "google_dataproc_job" "spark" {
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-
-  spark_config {
-    main_class    = "org.apache.spark.examples.SparkPi"
-    jar_file_uris = ["file:///usr/lib/spark/examples/jars/spark-examples.jar"]
-    args          = ["1000"]
-    properties = {
-      "spark.logConf" = "true"
-    }
-  }
-}
-`, rnd)
+
+	resource "google_dataproc_job" "spark" {
+
+		region       = "${google_dataproc_cluster.basic.region}"
+		force_delete = true
+		placement {
+			cluster_name = "${google_dataproc_cluster.basic.name}"
+		}
+
+		spark_config {
+			main_class    = "org.apache.spark.examples.SparkPi"
+			jar_file_uris = ["file:///usr/lib/spark/examples/jars/spark-examples.jar"]
+			args          = ["1000"]
+			properties    = {
+				"spark.logConf" = "true"
+			}
+		}
+	}
+	`, rnd)
 
 }
 
 func testAccDataprocJob_hadoop(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
-resource "google_dataproc_job" "hadoop" {
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-
-  hadoop_config {
-    main_jar_file_uri = "file:///usr/lib/hadoop-mapreduce/hadoop-mapreduce-examples.jar"
-    args = [
-      "wordcount",
-      "file:///usr/lib/spark/NOTICE",
-      "gs://${google_dataproc_cluster.basic.cluster_config[0].bucket}/hadoopjob_output_%s",
-    ]
-  }
-}
-`, rnd, rnd)
+
+	resource "google_dataproc_job" "hadoop" {
+
+		region       = "${google_dataproc_cluster.basic.region}"
+		force_delete = true
+		placement {
+			cluster_name = "${google_dataproc_cluster.basic.name}"
+		}
+
+		hadoop_config {
+			main_jar_file_uri =  "file:///usr/lib/hadoop-mapreduce/hadoop-mapreduce-examples.jar"
+			args              = [
+			  "wordcount",
+			  "file:///usr/lib/spark/NOTICE",
+			  "gs://${google_dataproc_cluster.basic.cluster_config.0.bucket}/hadoopjob_output_%s"
+			]
+		}
+
+	}
+	`, rnd, rnd)
 
 }
 
 func testAccDataprocJob_hive(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
-resource "google_dataproc_job" "hive" {
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-
-  hive_config {
-    query_list = [
-      "DROP TABLE IF EXISTS dprocjob_test",
-      "CREATE EXTERNAL TABLE dprocjob_test(bar int) LOCATION 'gs://${google_dataproc_cluster.basic.cluster_config[0].bucket}/hive_dprocjob_test/'",
-      "SELECT * FROM dprocjob_test WHERE bar > 2",
-    ]
-  }
-}
-`, rnd)
+
+	resource "google_dataproc_job" "hive" {
+
+		region       = "${google_dataproc_cluster.basic.region}"
+		force_delete = true
+		placement {
+			cluster_name = "${google_dataproc_cluster.basic.name}"
+		}
+
+		hive_config {
+			query_list       = [
+				"DROP TABLE IF EXISTS dprocjob_test",
+				"CREATE EXTERNAL TABLE dprocjob_test(bar int) LOCATION 'gs://${google_dataproc_cluster.basic.cluster_config.0.bucket}/hive_dprocjob_test/'",
+				"SELECT * FROM dprocjob_test WHERE bar > 2",
+			]
+		}
+
+	}
+	`, rnd)
 
 }
 
 func testAccDataprocJob_pig(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
-resource "google_dataproc_job" "pig" {
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-
-  pig_config {
-    query_list = [
-      "LNS = LOAD 'file:///usr/lib/pig/LICENSE.txt ' AS (line)",
-      "WORDS = FOREACH LNS GENERATE FLATTEN(TOKENIZE(line)) AS word",
-      "GROUPS = GROUP WORDS BY word",
-      "WORD_COUNTS = FOREACH GROUPS GENERATE group, COUNT(WORDS)",
-      "DUMP WORD_COUNTS",
-    ]
-  }
-}
-`, rnd)
+
+	resource "google_dataproc_job" "pig" {
+
+		region       = "${google_dataproc_cluster.basic.region}"
+		force_delete = true
+		placement {
+			cluster_name = "${google_dataproc_cluster.basic.name}"
+		}
+
+		pig_config {
+			query_list       = [
+				"LNS = LOAD 'file:///usr/lib/pig/LICENSE.txt ' AS (line)",
+				"WORDS = FOREACH LNS GENERATE FLATTEN(TOKENIZE(line)) AS word",
+				"GROUPS = GROUP WORDS BY word",
+				"WORD_COUNTS = FOREACH GROUPS GENERATE group, COUNT(WORDS)",
+				"DUMP WORD_COUNTS"
+			]
+		}
+	}
+	`, rnd)
 
 }
 
 func testAccDataprocJob_sparksql(rnd string) string {
 	return fmt.Sprintf(
 		singleNodeClusterConfig+`
-resource "google_dataproc_job" "sparksql" {
-  region       = google_dataproc_cluster.basic.region
-  force_delete = true
-  placement {
-    cluster_name = google_dataproc_cluster.basic.name
-  }
-
-  sparksql_config {
-    query_list = [
-      "DROP TABLE IF EXISTS dprocjob_test",
-      "CREATE TABLE dprocjob_test(bar int)",
-      "SELECT * FROM dprocjob_test WHERE bar > 2",
-    ]
-  }
-}
-`, rnd)
+
+	resource "google_dataproc_job" "sparksql" {
+
+		region       = "${google_dataproc_cluster.basic.region}"
+		force_delete = true
+		placement {
+			cluster_name = "${google_dataproc_cluster.basic.name}"
+		}
+
+		sparksql_config {
+			query_list       = [
+				"DROP TABLE IF EXISTS dprocjob_test",
+				"CREATE TABLE dprocjob_test(bar int)",
+				"SELECT * FROM dprocjob_test WHERE bar > 2",
+			]
+		}
+	}
+	`, rnd)
 
 }
diff --git a/google/resource_dns_managed_zone_test.go b/google/resource_dns_managed_zone_test.go
index a944e25068f..38633c72b82 100644
--- a/google/resource_dns_managed_zone_test.go
+++ b/google/resource_dns_managed_zone_test.go
@@ -115,16 +115,15 @@ func TestAccDNSManagedZone_dnssec_off(t *testing.T) {
 func testAccDnsManagedZone_basic(suffix, description string) string {
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "foobar" {
-  name        = "mzone-test-%s"
-  dns_name    = "tf-acctest-%s.hashicorptest.com."
-  description = "%s"
-  labels = {
-    foo = "bar"
-  }
+	name = "mzone-test-%s"
+	dns_name = "tf-acctest-%s.hashicorptest.com."
+	description = "%s"
+	labels = {
+		foo = "bar"
+	}
 
-  visibility = "public"
-}
-`, suffix, suffix, description)
+	visibility = "public"
+}`, suffix, suffix, description)
 }
 
 func testAccDnsManagedZone_dnssec_on(suffix string) string {
@@ -146,8 +145,7 @@ resource "google_dns_managed_zone" "foobar" {
       key_type   = "keySigning"
     }
   }
-}
-`, suffix, suffix)
+}`, suffix, suffix)
 }
 
 func testAccDnsManagedZone_dnssec_off(suffix string) string {
@@ -159,42 +157,40 @@ resource "google_dns_managed_zone" "foobar" {
   dnssec_config {
     state = "off"
   }
-}
-`, suffix, suffix)
+}`, suffix, suffix)
 }
 
 func testAccDnsManagedZone_privateUpdate(suffix, first_network, second_network string) string {
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "private" {
-  name        = "private-zone-%s"
-  dns_name    = "private.example.com."
+  name = "private-zone-%s"
+  dns_name = "private.example.com."
   description = "Example private DNS zone"
-  visibility  = "private"
+  visibility = "private"
   private_visibility_config {
     networks {
-      network_url = google_compute_network.%s.self_link
+      network_url = "${google_compute_network.%s.self_link}"
     }
     networks {
-      network_url = google_compute_network.%s.self_link
+      network_url = "${google_compute_network.%s.self_link}"
     }
   }
 }
 
 resource "google_compute_network" "network-1" {
-  name                    = "network-1-%s"
+  name = "network-1-%s"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_network" "network-2" {
-  name                    = "network-2-%s"
+  name = "network-2-%s"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_network" "network-3" {
-  name                    = "network-3-%s"
+  name = "network-3-%s"
   auto_create_subnetworks = false
-}
-`, suffix, first_network, second_network, suffix, suffix, suffix)
+}`, suffix, first_network, second_network, suffix, suffix, suffix)
 }
 
 func TestDnsManagedZoneImport_parseImportId(t *testing.T) {
@@ -300,10 +296,9 @@ func TestAccDNSManagedZone_importWithProject(t *testing.T) {
 func testAccDnsManagedZone_basicWithProject(suffix, description, project string) string {
 	return fmt.Sprintf(`
 resource "google_dns_managed_zone" "foobar" {
-  name        = "mzone-test-%s"
-  dns_name    = "tf-acctest-%s.hashicorptest.com."
-  description = "%s"
-  project     = "%s"
-}
-`, suffix, suffix, description, project)
+	name = "mzone-test-%s"
+	dns_name = "tf-acctest-%s.hashicorptest.com."
+	description = "%s"
+	project = "%s"
+}`, suffix, suffix, description, project)
 }
diff --git a/google/resource_dns_record_set_test.go b/google/resource_dns_record_set_test.go
index dab0d63916f..26e0df71b2e 100644
--- a/google/resource_dns_record_set_test.go
+++ b/google/resource_dns_record_set_test.go
@@ -266,114 +266,108 @@ func testAccCheckDnsRecordSetExists(resourceType, resourceName string) resource.
 
 func testAccDnsRecordSet_basic(zoneName string, addr2 string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "test-record.%s.hashicorptest.com."
-  type         = "A"
-  rrdatas      = ["127.0.0.1", "%s"]
-  ttl          = %d
-}
-`, zoneName, zoneName, zoneName, addr2, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "test-record.%s.hashicorptest.com."
+		type = "A"
+		rrdatas = ["127.0.0.1", "%s"]
+		ttl = %d
+	}
+	`, zoneName, zoneName, zoneName, addr2, ttl)
 }
 
 func testAccDnsRecordSet_ns(name string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "%s.hashicorptest.com."
-  type         = "NS"
-  rrdatas      = ["ns.hashicorp.services.", "ns2.hashicorp.services."]
-  ttl          = %d
-}
-`, name, name, name, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "%s.hashicorptest.com."
+		type = "NS"
+		rrdatas = ["ns.hashicorp.services.", "ns2.hashicorp.services."]
+		ttl = %d
+	}
+	`, name, name, name, ttl)
 }
 
 func testAccDnsRecordSet_nestedNS(name string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "nested.%s.hashicorptest.com."
-  type         = "NS"
-  rrdatas      = ["ns.hashicorp.services.", "ns2.hashicorp.services."]
-  ttl          = %d
-}
-`, name, name, name, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "nested.%s.hashicorptest.com."
+		type = "NS"
+		rrdatas = ["ns.hashicorp.services.", "ns2.hashicorp.services."]
+		ttl = %d
+	}
+	`, name, name, name, ttl)
 }
 
 func testAccDnsRecordSet_bigChange(zoneName string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "test-record.%s.hashicorptest.com."
-  type         = "CNAME"
-  rrdatas      = ["www.terraform.io."]
-  ttl          = %d
-}
-`, zoneName, zoneName, zoneName, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "test-record.%s.hashicorptest.com."
+		type = "CNAME"
+		rrdatas = ["www.terraform.io."]
+		ttl = %d
+	}
+	`, zoneName, zoneName, zoneName, ttl)
 }
 
 func testAccDnsRecordSet_quotedTXT(name string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "test-record.%s.hashicorptest.com."
-  type         = "TXT"
-  rrdatas      = ["test", "\"quoted test\""]
-  ttl          = %d
-}
-`, name, name, name, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "test-record.%s.hashicorptest.com."
+		type = "TXT"
+		rrdatas = ["test", "\"quoted test\""]
+		ttl = %d
+	}
+	`, name, name, name, ttl)
 }
 
 func testAccDnsRecordSet_uppercaseMX(name string, ttl int) string {
 	return fmt.Sprintf(`
-resource "google_dns_managed_zone" "parent-zone" {
-  name        = "%s"
-  dns_name    = "%s.hashicorptest.com."
-  description = "Test Description"
-}
-
-resource "google_dns_record_set" "foobar" {
-  managed_zone = google_dns_managed_zone.parent-zone.name
-  name         = "test-record.%s.hashicorptest.com."
-  type         = "MX"
-  rrdatas = [
-    "1 ASPMX.L.GOOGLE.COM.",
-    "5 ALT1.ASPMX.L.GOOGLE.COM.",
-    "5 ALT2.ASPMX.L.GOOGLE.COM.",
-    "10 ASPMX2.GOOGLEMAIL.COM.",
-    "10 ASPMX3.GOOGLEMAIL.COM.",
-  ]
-  ttl = %d
-}
-`, name, name, name, ttl)
+	resource "google_dns_managed_zone" "parent-zone" {
+		name = "%s"
+		dns_name = "%s.hashicorptest.com."
+		description = "Test Description"
+	}
+	resource "google_dns_record_set" "foobar" {
+		managed_zone = "${google_dns_managed_zone.parent-zone.name}"
+		name = "test-record.%s.hashicorptest.com."
+		type = "MX"
+		rrdatas = [
+			"1 ASPMX.L.GOOGLE.COM.",
+			"5 ALT1.ASPMX.L.GOOGLE.COM.",
+			"5 ALT2.ASPMX.L.GOOGLE.COM.",
+			"10 ASPMX2.GOOGLEMAIL.COM.",
+			"10 ASPMX3.GOOGLEMAIL.COM.",
+		]
+		ttl = %d
+	}
+	`, name, name, name, ttl)
 }
diff --git a/google/resource_endpoints_service_test.go b/google/resource_endpoints_service_test.go
index eb7f612f7a5..05fc875d073 100644
--- a/google/resource_endpoints_service_test.go
+++ b/google/resource_endpoints_service_test.go
@@ -97,10 +97,9 @@ func TestEndpointsService_grpcMigrateState(t *testing.T) {
 }
 
 func testAccEndpointsService_basic(random_name string) string {
-	return fmt.Sprintf(`
-resource "google_endpoints_service" "endpoints_service" {
-  service_name   = "%s.endpoints.%s.cloud.goog"
-  project        = "%s"
+	return fmt.Sprintf(`resource "google_endpoints_service" "endpoints_service" {
+  service_name = "%s.endpoints.%s.cloud.goog"
+  project = "%s"
   openapi_config = <<EOF
 swagger: "2.0"
 info:
@@ -142,17 +141,14 @@ definitions:
       message:
         type: "string"
 EOF
-
-}
-`, random_name, getTestProjectFromEnv(), getTestProjectFromEnv(), random_name, getTestProjectFromEnv())
+}`, random_name, getTestProjectFromEnv(), getTestProjectFromEnv(), random_name, getTestProjectFromEnv())
 }
 
 func testAccEndpointsService_grpc(random_name string) string {
-	return fmt.Sprintf(`
-resource "google_endpoints_service" "endpoints_service" {
+	return fmt.Sprintf(`resource "google_endpoints_service" "endpoints_service" {
   service_name = "%s.endpoints.%s.cloud.goog"
-  project      = "%s"
-  grpc_config  = <<EOF
+  project = "%s"
+  grpc_config = <<EOF
 type: google.api.Service
 config_version: 3
 name: %s.endpoints.%s.cloud.goog
@@ -161,10 +157,8 @@ usage:
   - selector: endpoints.examples.bookstore.Bookstore.ListShelves
     allow_unregistered_calls: true
 EOF
-
-  protoc_output_base64 = filebase64("test-fixtures/test_api_descriptor.pb")
-}
-`, random_name, getTestProjectFromEnv(), getTestProjectFromEnv(), random_name, getTestProjectFromEnv())
+  protoc_output_base64 = "${filebase64("test-fixtures/test_api_descriptor.pb")}"
+}`, random_name, getTestProjectFromEnv(), getTestProjectFromEnv(), random_name, getTestProjectFromEnv())
 }
 
 func testAccCheckEndpointExistsByName(random_name string) resource.TestCheckFunc {
diff --git a/google/resource_google_billing_account_iam_test.go b/google/resource_google_billing_account_iam_test.go
index 2cfec392cd8..e02e2205954 100644
--- a/google/resource_google_billing_account_iam_test.go
+++ b/google/resource_google_billing_account_iam_test.go
@@ -132,9 +132,9 @@ resource "google_service_account" "test-account" {
 }
 
 resource "google_billing_account_iam_binding" "foo" {
-  billing_account_id = "%s"
-  role               = "%s"
-  members            = ["serviceAccount:${google_service_account.test-account.email}"]
+  billing_account_id  = "%s"
+  role                = "%s"
+  members             = ["serviceAccount:${google_service_account.test-account.email}"]
 }
 `, account, billingAccountId, role)
 }
@@ -152,11 +152,11 @@ resource "google_service_account" "test-account-2" {
 }
 
 resource "google_billing_account_iam_binding" "foo" {
-  billing_account_id = "%s"
-  role               = "%s"
-  members = [
+  billing_account_id  = "%s"
+  role                = "%s"
+  members             = [
     "serviceAccount:${google_service_account.test-account.email}",
-    "serviceAccount:${google_service_account.test-account-2.email}",
+    "serviceAccount:${google_service_account.test-account-2.email}"
   ]
 }
 `, account, account, billingAccountId, role)
diff --git a/google/resource_google_folder_iam_binding_test.go b/google/resource_google_folder_iam_binding_test.go
index 86741b87bff..17ac0ab1db0 100644
--- a/google/resource_google_folder_iam_binding_test.go
+++ b/google/resource_google_folder_iam_binding_test.go
@@ -288,7 +288,7 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_binding" "acceptance" {
-  folder  = google_folder.acceptance.name
+  folder = "${google_folder.acceptance.name}"
   members = ["user:admin@hashicorptest.com"]
   role    = "roles/compute.instanceAdmin"
 }
@@ -303,13 +303,13 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_binding" "acceptance" {
-  folder  = google_folder.acceptance.name
+  folder = "${google_folder.acceptance.name}"
   members = ["user:admin@hashicorptest.com"]
   role    = "roles/compute.instanceAdmin"
 }
 
 resource "google_folder_iam_binding" "multiple" {
-  folder  = google_folder.acceptance.name
+  folder = "${google_folder.acceptance.name}"
   members = ["user:paddy@hashicorp.com"]
   role    = "roles/viewer"
 }
@@ -324,7 +324,7 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_binding" "acceptance" {
-  folder  = google_folder.acceptance.name
+  folder = "${google_folder.acceptance.name}"
   members = ["user:admin@hashicorptest.com", "user:paddy@hashicorp.com"]
   role    = "roles/compute.instanceAdmin"
 }
@@ -339,7 +339,7 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_binding" "acceptance" {
-  folder  = google_folder.acceptance.name
+  folder = "${google_folder.acceptance.name}"
   members = ["user:paddy@hashicorp.com"]
   role    = "roles/compute.instanceAdmin"
 }
diff --git a/google/resource_google_folder_iam_member_test.go b/google/resource_google_folder_iam_member_test.go
index e2f138dd3df..5024bec845d 100644
--- a/google/resource_google_folder_iam_member_test.go
+++ b/google/resource_google_folder_iam_member_test.go
@@ -127,9 +127,9 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_member" "acceptance" {
-  folder = google_folder.acceptance.name
-  member = "user:admin@hashicorptest.com"
-  role   = "roles/compute.instanceAdmin"
+  folder = "${google_folder.acceptance.name}"
+  member  = "user:admin@hashicorptest.com"
+  role    = "roles/compute.instanceAdmin"
 }
 `, org, fname)
 }
@@ -142,15 +142,15 @@ resource "google_folder" "acceptance" {
 }
 
 resource "google_folder_iam_member" "acceptance" {
-  folder = google_folder.acceptance.name
-  member = "user:admin@hashicorptest.com"
-  role   = "roles/compute.instanceAdmin"
+  folder = "${google_folder.acceptance.name}"
+  member  = "user:admin@hashicorptest.com"
+  role    = "roles/compute.instanceAdmin"
 }
 
 resource "google_folder_iam_member" "multiple" {
-  folder = google_folder.acceptance.name
-  member = "user:paddy@hashicorp.com"
-  role   = "roles/compute.instanceAdmin"
+  folder = "${google_folder.acceptance.name}"
+  member  = "user:paddy@hashicorp.com"
+  role    = "roles/compute.instanceAdmin"
 }
 `, org, fname)
 }
diff --git a/google/resource_google_folder_iam_policy_test.go b/google/resource_google_folder_iam_policy_test.go
index d382111c75d..23486d4f619 100644
--- a/google/resource_google_folder_iam_policy_test.go
+++ b/google/resource_google_folder_iam_policy_test.go
@@ -104,19 +104,19 @@ func testAccFolderIamPolicy_basic(folder, parent, role, member string) string {
 	return fmt.Sprintf(`
 resource "google_folder" "permissiontest" {
   display_name = "%s"
-  parent       = "%s"
+  parent = "%s"
 }
 
 data "google_iam_policy" "test" {
   binding {
-    role    = "%s"
+    role = "%s"
     members = ["%s"]
   }
 }
 
 resource "google_folder_iam_policy" "test" {
-  folder      = google_folder.permissiontest.name
-  policy_data = data.google_iam_policy.test.policy_data
+  folder = "${google_folder.permissiontest.name}"
+  policy_data = "${data.google_iam_policy.test.policy_data}"
 }
 `, folder, parent, role, member)
 }
@@ -125,24 +125,24 @@ func testAccFolderIamPolicy_basic2(folder, parent, role, member, role2, member2
 	return fmt.Sprintf(`
 resource "google_folder" "permissiontest" {
   display_name = "%s"
-  parent       = "%s"
+  parent = "%s"
 }
 
 data "google_iam_policy" "test" {
   binding {
-    role    = "%s"
+    role = "%s"
     members = ["%s"]
   }
 
   binding {
-    role    = "%s"
+    role = "%s"
     members = ["%s"]
   }
 }
 
 resource "google_folder_iam_policy" "test" {
-  folder      = google_folder.permissiontest.name
-  policy_data = data.google_iam_policy.test.policy_data
+  folder = "${google_folder.permissiontest.name}"
+  policy_data = "${data.google_iam_policy.test.policy_data}"
 }
 `, folder, parent, role, member, role2, member2)
 }
@@ -151,18 +151,18 @@ func testAccFolderIamPolicy_auditConfigs(folder, parent, role, member string) st
 	return fmt.Sprintf(`
 resource "google_folder" "permissiontest" {
   display_name = "%s"
-  parent       = "%s"
+  parent = "%s"
 }
 
 data "google_iam_policy" "test" {
   binding {
-    role    = "%s"
+    role = "%s"
     members = ["%s"]
   }
   audit_config {
     service = "cloudkms.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["%s"]
     }
 
@@ -173,7 +173,7 @@ data "google_iam_policy" "test" {
   audit_config {
     service = "cloudsql.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["%s"]
     }
 
@@ -184,8 +184,8 @@ data "google_iam_policy" "test" {
 }
 
 resource "google_folder_iam_policy" "test" {
-  folder      = google_folder.permissiontest.name
-  policy_data = data.google_iam_policy.test.policy_data
+  folder = "${google_folder.permissiontest.name}"
+  policy_data = "${data.google_iam_policy.test.policy_data}"
 }
 `, folder, parent, role, member, member, member)
 }
diff --git a/google/resource_google_folder_organization_policy_test.go b/google/resource_google_folder_organization_policy_test.go
index 83acdc35d0e..1eb4339f73d 100644
--- a/google/resource_google_folder_organization_policy_test.go
+++ b/google/resource_google_folder_organization_policy_test.go
@@ -308,8 +308,8 @@ resource "google_folder" "orgpolicy" {
 }
 
 resource "google_folder_organization_policy" "bool" {
-  # Test numeric folder ID.
-  folder     = replace(google_folder.orgpolicy.name, "folders/", "")
+    # Test numeric folder ID.
+  folder     = "${replace(google_folder.orgpolicy.name, "folders/", "")}"
   constraint = "constraints/compute.disableSerialPortAccess"
 
   boolean_policy {
@@ -327,7 +327,7 @@ resource "google_folder" "orgpolicy" {
 }
 
 resource "google_folder_organization_policy" "list" {
-  folder     = google_folder.orgpolicy.name
+  folder     = "${google_folder.orgpolicy.name}"
   constraint = "constraints/serviceuser.services"
 
   list_policy {
@@ -347,7 +347,7 @@ resource "google_folder" "orgpolicy" {
 }
 
 resource "google_folder_organization_policy" "list" {
-  folder     = google_folder.orgpolicy.name
+  folder     = "${google_folder.orgpolicy.name}"
   constraint = "constraints/compute.trustedImageProjects"
 
   list_policy {
@@ -367,7 +367,7 @@ resource "google_folder" "orgpolicy" {
 }
 
 resource "google_folder_organization_policy" "list" {
-  folder     = google_folder.orgpolicy.name
+  folder     = "${google_folder.orgpolicy.name}"
   constraint = "serviceuser.services"
 
   list_policy {
@@ -390,12 +390,12 @@ resource "google_folder" "orgpolicy" {
 }
 
 resource "google_folder_organization_policy" "restore" {
-  folder     = google_folder.orgpolicy.name
-  constraint = "serviceuser.services"
+    folder     = "${google_folder.orgpolicy.name}"
+    constraint = "serviceuser.services"
 
-  restore_policy {
-    default = true
-  }
+    restore_policy {
+        default = true
+    }
 }
 `, folder, "organizations/"+org)
 }
diff --git a/google/resource_google_folder_test.go b/google/resource_google_folder_test.go
index 08fc42b9182..19c05f0584d 100644
--- a/google/resource_google_folder_test.go
+++ b/google/resource_google_folder_test.go
@@ -149,7 +149,7 @@ func testAccFolder_basic(folder, parent string) string {
 	return fmt.Sprintf(`
 resource "google_folder" "folder1" {
   display_name = "%s"
-  parent       = "%s"
+  parent = "%s"
 }
 `, folder, parent)
 }
@@ -158,12 +158,12 @@ func testAccFolder_move(folder1, folder2, parent string) string {
 	return fmt.Sprintf(`
 resource "google_folder" "folder1" {
   display_name = "%s"
-  parent       = google_folder.folder2.name
+  parent = "${google_folder.folder2.name}"
 }
 
 resource "google_folder" "folder2" {
   display_name = "%s"
-  parent       = "%s"
+  parent = "%s"
 }
 `, folder1, folder2, parent)
 }
diff --git a/google/resource_google_organization_iam_test.go b/google/resource_google_organization_iam_test.go
index 4a39bfa1fb1..fa3dbc939a0 100644
--- a/google/resource_google_organization_iam_test.go
+++ b/google/resource_google_organization_iam_test.go
@@ -159,7 +159,7 @@ resource "google_organization_iam_custom_role" "test-role" {
 
 resource "google_organization_iam_binding" "foo" {
   org_id  = "%s"
-  role    = google_organization_iam_custom_role.test-role.id
+  role    = "${google_organization_iam_custom_role.test-role.id}"
   members = ["serviceAccount:${google_service_account.test-account.email}"]
 }
 `, account, role, org, org)
@@ -185,11 +185,11 @@ resource "google_service_account" "test-account-2" {
 }
 
 resource "google_organization_iam_binding" "foo" {
-  org_id = "%s"
-  role   = google_organization_iam_custom_role.test-role.id
+  org_id  = "%s"
+  role    = "${google_organization_iam_custom_role.test-role.id}"
   members = [
     "serviceAccount:${google_service_account.test-account.email}",
-    "serviceAccount:${google_service_account.test-account-2.email}",
+    "serviceAccount:${google_service_account.test-account-2.email}"
   ]
 }
 `, account, role, org, account, org)
diff --git a/google/resource_google_organization_policy_test.go b/google/resource_google_organization_policy_test.go
index 22a9cd8561d..73d3ebcd70c 100644
--- a/google/resource_google_organization_policy_test.go
+++ b/google/resource_google_organization_policy_test.go
@@ -336,12 +336,12 @@ func getGoogleOrganizationPolicyTestResource(s *terraform.State, n string) (*clo
 func testAccOrganizationPolicyConfig_boolean(org string, enforced bool) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "bool" {
-  org_id     = "%s"
-  constraint = "constraints/compute.disableSerialPortAccess"
+    org_id = "%s"
+    constraint = "constraints/compute.disableSerialPortAccess"
 
-  boolean_policy {
-    enforced = %t
-  }
+    boolean_policy {
+        enforced = %t
+    }
 }
 `, org, enforced)
 }
@@ -349,14 +349,14 @@ resource "google_organization_policy" "bool" {
 func testAccOrganizationPolicyConfig_list_allowAll(org string) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "list" {
-  org_id     = "%s"
-  constraint = "constraints/serviceuser.services"
+    org_id = "%s"
+    constraint = "constraints/serviceuser.services"
 
-  list_policy {
-    allow {
-      all = true
+    list_policy {
+        allow {
+            all = true
+        }
     }
-  }
 }
 `, org)
 }
@@ -364,16 +364,16 @@ resource "google_organization_policy" "list" {
 func testAccOrganizationPolicyConfig_list_allowSome(org, project string) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "list" {
-  org_id     = "%s"
-  constraint = "constraints/compute.trustedImageProjects"
-
-  list_policy {
-    allow {
-      values = [
-        "projects/%s",
-        "projects/debian-cloud",
-      ]
-    }
+    org_id = "%s"
+    constraint = "constraints/compute.trustedImageProjects"
+
+    list_policy {
+        allow {
+            values = [
+                "projects/%s",
+                "projects/debian-cloud"
+            ]
+        }
   }
 }
 `, org, project)
@@ -382,17 +382,17 @@ resource "google_organization_policy" "list" {
 func testAccOrganizationPolicyConfig_list_denySome(org string) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "list" {
-  org_id     = "%s"
-  constraint = "serviceuser.services"
-
-  list_policy {
-    deny {
-      values = [
-        "doubleclicksearch.googleapis.com",
-        "replicapoolupdater.googleapis.com",
-      ]
+    org_id = "%s"
+    constraint = "serviceuser.services"
+
+    list_policy {
+        deny {
+            values = [
+                "doubleclicksearch.googleapis.com",
+                "replicapoolupdater.googleapis.com",
+            ]
+        }
     }
-  }
 }
 `, org)
 }
@@ -400,18 +400,18 @@ resource "google_organization_policy" "list" {
 func testAccOrganizationPolicyConfig_list_inheritFromParent(org string) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "list" {
-  org_id     = "%s"
-  constraint = "serviceuser.services"
-
-  list_policy {
-    deny {
-      values = [
-        "doubleclicksearch.googleapis.com",
-        "replicapoolupdater.googleapis.com",
-      ]
+    org_id = "%s"
+    constraint = "serviceuser.services"
+
+    list_policy {
+        deny {
+            values = [
+                "doubleclicksearch.googleapis.com",
+                "replicapoolupdater.googleapis.com",
+            ]
+        }
+        inherit_from_parent = true
     }
-    inherit_from_parent = true
-  }
 }
 `, org)
 }
@@ -419,12 +419,12 @@ resource "google_organization_policy" "list" {
 func testAccOrganizationPolicyConfig_restore_defaultTrue(org string) string {
 	return fmt.Sprintf(`
 resource "google_organization_policy" "restore" {
-  org_id     = "%s"
-  constraint = "serviceuser.services"
+    org_id = "%s"
+    constraint = "serviceuser.services"
 
-  restore_policy {
-    default = true
-  }
+    restore_policy {
+        default = true
+    }
 }
 `, org)
 }
diff --git a/google/resource_google_project_iam_audit_config_test.go b/google/resource_google_project_iam_audit_config_test.go
index 58bb9e3bb13..1b2a74a17c9 100644
--- a/google/resource_google_project_iam_audit_config_test.go
+++ b/google/resource_google_project_iam_audit_config_test.go
@@ -304,13 +304,13 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "DATA_READ"
     exempted_members = [
       "user:paddy@hashicorp.com",
-      "user:paddy@carvers.co",
+      "user:paddy@carvers.co"
     ]
   }
 }
@@ -326,19 +326,19 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
-    log_type = "DATA_READ"
+    log_type = "DATA_READ" 
     exempted_members = [
       "user:paddy@hashicorp.com",
-      "user:paddy@carvers.co",
+      "user:paddy@carvers.co"
     ]
   }
 }
 
 resource "google_project_iam_audit_config" "multiple" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "DATA_WRITE"
@@ -356,13 +356,13 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "DATA_WRITE"
     exempted_members = [
       "user:admin@hashicorptest.com",
-      "user:paddy@carvers.co",
+      "user:paddy@carvers.co"
     ]
   }
 }
@@ -378,7 +378,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "DATA_READ"
@@ -406,7 +406,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "DATA_READ"%s
@@ -424,7 +424,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_audit_config" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
   audit_log_config {
     log_type = "%s"
diff --git a/google/resource_google_project_iam_binding_test.go b/google/resource_google_project_iam_binding_test.go
index a9b61fb7fd7..660f7a4b64e 100644
--- a/google/resource_google_project_iam_binding_test.go
+++ b/google/resource_google_project_iam_binding_test.go
@@ -222,7 +222,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_binding" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = ["user:admin@hashicorptest.com"]
   role    = "%s"
 }
@@ -238,13 +238,13 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_binding" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = ["user:admin@hashicorptest.com"]
   role    = "%s"
 }
 
 resource "google_project_iam_binding" "multiple" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = ["user:paddy@hashicorp.com"]
   role    = "%s"
 }
@@ -260,7 +260,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_binding" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = ["user:admin@hashicorptest.com", "user:paddy@hashicorp.com"]
   role    = "%s"
 }
@@ -276,7 +276,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_binding" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = ["user:paddy@hashicorp.com"]
   role    = "%s"
 }
@@ -292,7 +292,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_binding" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   members = []
   role    = "%s"
 }
diff --git a/google/resource_google_project_iam_member_test.go b/google/resource_google_project_iam_member_test.go
index 3fffe8eda19..1480bd3d254 100644
--- a/google/resource_google_project_iam_member_test.go
+++ b/google/resource_google_project_iam_member_test.go
@@ -139,7 +139,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_member" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   role    = "%s"
   member  = "%s"
 }
@@ -155,13 +155,13 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_iam_member" "acceptance" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   role    = "%s"
   member  = "%s"
 }
 
 resource "google_project_iam_member" "multiple" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   role    = "%s"
   member  = "%s"
 }
diff --git a/google/resource_google_project_iam_policy_test.go b/google/resource_google_project_iam_policy_test.go
index 814c6b4a2ad..89e61b6938e 100644
--- a/google/resource_google_project_iam_policy_test.go
+++ b/google/resource_google_project_iam_policy_test.go
@@ -203,14 +203,14 @@ func testAccProjectExistingPolicy(pid string) resource.TestCheckFunc {
 func testAccProjectAssociatePolicyBasic(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
 }
 
 resource "google_project_iam_policy" "acceptance" {
-  project     = google_project.acceptance.id
-  policy_data = data.google_iam_policy.admin.policy_data
+    project = "${google_project.acceptance.id}"
+    policy_data = "${data.google_iam_policy.admin.policy_data}"
 }
 
 data "google_iam_policy" "admin" {
@@ -234,14 +234,14 @@ data "google_iam_policy" "admin" {
 func testAccProjectAssociatePolicyAuditConfigBasic(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
 }
 
 resource "google_project_iam_policy" "acceptance" {
-  project     = google_project.acceptance.id
-  policy_data = data.google_iam_policy.admin.policy_data
+    project = "${google_project.acceptance.id}"
+    policy_data = "${data.google_iam_policy.admin.policy_data}"
 }
 
 data "google_iam_policy" "admin" {
@@ -261,7 +261,7 @@ data "google_iam_policy" "admin" {
   audit_config {
     service = "cloudkms.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["user:paddy@hashicorp.com"]
     }
 
@@ -272,7 +272,7 @@ data "google_iam_policy" "admin" {
   audit_config {
     service = "cloudsql.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["user:paddy@hashicorp.com"]
     }
 
@@ -287,77 +287,72 @@ data "google_iam_policy" "admin" {
 func testAccProject_create(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
-}
-`, pid, name, org)
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
+}`, pid, name, org)
 }
 
 func testAccProjectIamPolicyEmptyMembers(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
 }
 
 resource "google_project_iam_policy" "acceptance" {
-  project     = google_project.acceptance.id
-  policy_data = data.google_iam_policy.expanded.policy_data
+    project = "${google_project.acceptance.id}"
+    policy_data = "${data.google_iam_policy.expanded.policy_data}"
 }
 
 data "google_iam_policy" "expanded" {
-  binding {
-    role    = "roles/viewer"
-    members = []
-  }
-}
-`, pid, name, org)
+    binding {
+        role = "roles/viewer"
+		members = []
+    }
+}`, pid, name, org)
 }
 
 func testAccProjectAssociatePolicyExpanded(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
 }
-
 resource "google_project_iam_policy" "acceptance" {
-  project     = google_project.acceptance.id
-  policy_data = data.google_iam_policy.expanded.policy_data
+    project = "${google_project.acceptance.id}"
+    policy_data = "${data.google_iam_policy.expanded.policy_data}"
 }
 
 data "google_iam_policy" "expanded" {
-  binding {
-    role = "roles/viewer"
-    members = [
-      "user:paddy@carvers.co",
-    ]
-  }
+    binding {
+        role = "roles/viewer"
+        members = [
+            "user:paddy@carvers.co",
+        ]
+    }
 
-  binding {
-    role = "roles/viewer"
-    members = [
-      "user:paddy@hashicorp.com",
-    ]
-  }
-}
-`, pid, name, org)
+    binding {
+        role = "roles/viewer"
+        members = [
+            "user:paddy@hashicorp.com",
+        ]
+    }
+}`, pid, name, org)
 }
 
 func testAccProjectAssociatePolicyAuditConfigExpanded(pid, name, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
 }
-
 resource "google_project_iam_policy" "acceptance" {
-  project     = google_project.acceptance.id
-  policy_data = data.google_iam_policy.expanded.policy_data
+    project = "${google_project.acceptance.id}"
+    policy_data = "${data.google_iam_policy.expanded.policy_data}"
 }
 
 data "google_iam_policy" "expanded" {
@@ -377,7 +372,7 @@ data "google_iam_policy" "expanded" {
   audit_config {
     service = "cloudkms.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["user:paddy@hashicorp.com"]
     }
 
@@ -388,7 +383,7 @@ data "google_iam_policy" "expanded" {
   audit_config {
     service = "cloudkms.googleapis.com"
     audit_log_configs {
-      log_type         = "DATA_READ"
+      log_type = "DATA_READ"
       exempted_members = ["user:paddy@hashicorp.com"]
     }
 
@@ -396,6 +391,5 @@ data "google_iam_policy" "expanded" {
       log_type = "DATA_WRITE"
     }
   }
-}
-`, pid, name, org)
+}`, pid, name, org)
 }
diff --git a/google/resource_google_project_organization_policy_test.go b/google/resource_google_project_organization_policy_test.go
index e6fbdbcf7a8..f8c450663be 100644
--- a/google/resource_google_project_organization_policy_test.go
+++ b/google/resource_google_project_organization_policy_test.go
@@ -363,6 +363,7 @@ resource "google_project_organization_policy" "list" {
 
 func testAccProjectOrganizationPolicyConfig_list_allowSome(pid string) string {
 	return fmt.Sprintf(`
+
 resource "google_project_organization_policy" "list" {
   project    = "%s"
   constraint = "constraints/compute.trustedImageProjects"
@@ -378,6 +379,7 @@ resource "google_project_organization_policy" "list" {
 
 func testAccProjectOrganizationPolicyConfig_list_denySome(pid string) string {
 	return fmt.Sprintf(`
+
 resource "google_project_organization_policy" "list" {
   project    = "%s"
   constraint = "constraints/serviceuser.services"
@@ -400,9 +402,9 @@ resource "google_project_organization_policy" "restore" {
   project    = "%s"
   constraint = "constraints/serviceuser.services"
 
-  restore_policy {
-    default = true
-  }
+    restore_policy {
+        default = true
+    }
 }
 `, pid)
 }
diff --git a/google/resource_google_project_service_test.go b/google/resource_google_project_service_test.go
index 48f28f37c94..08e1484c448 100644
--- a/google/resource_google_project_service_test.go
+++ b/google/resource_google_project_service_test.go
@@ -191,14 +191,15 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_service" "test" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
 }
 
 resource "google_project_service" "test2" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
 }
+
 `, pid, name, org, services[0], services[1])
 }
 
@@ -212,12 +213,12 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_service" "test" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
 }
 
 resource "google_project_service" "test2" {
-  project                    = google_project.acceptance.project_id
+  project                    = "${google_project.acceptance.project_id}"
   service                    = "%s"
   disable_dependent_services = %s
 }
@@ -234,7 +235,7 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_service" "test" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
 }
 `, pid, name, org, billing, services[0])
@@ -249,14 +250,14 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_service" "test" {
-  project            = google_project.acceptance.project_id
-  service            = "%s"
+  project = "${google_project.acceptance.project_id}"
+  service = "%s"
   disable_on_destroy = false
 }
 
 resource "google_project_service" "test2" {
-  project            = google_project.acceptance.project_id
-  service            = "%s"
+  project = "${google_project.acceptance.project_id}"
+  service = "%s"
   disable_on_destroy = false
 }
 `, pid, name, org, services[0], services[1])
@@ -273,11 +274,11 @@ resource "google_project" "acceptance" {
 // by passing through locals, we break the dependency chain
 // see terraform-provider-google#1292
 locals {
-  project_id = google_project.acceptance.project_id
+  project_id = "${google_project.acceptance.project_id}"
 }
 
 resource "google_project_service" "test" {
-  project = local.project_id
+  project = "${local.project_id}"
   service = "%s"
 }
 `, pid, name, org, service)
@@ -301,10 +302,11 @@ resource "google_project" "acceptance" {
 }
 
 resource "google_project_service" "test" {
-  project = google_project.acceptance.project_id
+  project = "${google_project.acceptance.project_id}"
   service = "%s"
 
   disable_dependent_services = true
 }
+
 `, pid, name, org, service)
 }
diff --git a/google/resource_google_project_test.go b/google/resource_google_project_test.go
index 06682198c13..6df0cbcc17c 100644
--- a/google/resource_google_project_test.go
+++ b/google/resource_google_project_test.go
@@ -309,30 +309,28 @@ func testAccCheckGoogleProjectHasNoLabels(r, pid string) resource.TestCheckFunc
 func testAccProject_createWithoutOrg(pid, name string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-}
-`, pid, name)
+    project_id = "%s"
+    name = "%s"
+}`, pid, name)
 }
 
 func testAccProject_createBilling(pid, name, org, billing string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id      = "%s"
-  name            = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
-}
-`, pid, name, org, billing)
+    project_id = "%s"
+    name = "%s"
+    org_id = "%s"
+    billing_account = "%s"
+}`, pid, name, org, billing)
 }
 
 func testAccProject_labels(pid, name, org string, labels map[string]string) string {
 	r := fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  project_id = "%s"
-  name       = "%s"
-  org_id     = "%s"
-  labels = {`, pid, name, org)
+    project_id = "%s"
+    name       = "%s"
+    org_id     = "%s"
+	labels = {`, pid, name, org)
 
 	l := ""
 	for key, value := range labels {
@@ -349,10 +347,9 @@ resource "google_project" "acceptance" {
   project_id          = "%s"
   name                = "%s"
   org_id              = "%s"
-  billing_account     = "%s" # requires billing to enable compute API
+  billing_account     = "%s"  # requires billing to enable compute API
   auto_create_network = false
-}
-`, pid, name, org, billing)
+}`, pid, name, org, billing)
 }
 
 func testAccProject_parentFolder(pid, projectName, folderName, org string) string {
@@ -360,16 +357,16 @@ func testAccProject_parentFolder(pid, projectName, folderName, org string) strin
 resource "google_project" "acceptance" {
   project_id = "%s"
   name       = "%s"
-
   # ensures we can set both org_id and folder_id as long as only one is not empty.
-  org_id    = ""
-  folder_id = google_folder.folder1.id
+  org_id     = ""                            
+  folder_id  = "${google_folder.folder1.id}"
 }
 
 resource "google_folder" "folder1" {
   display_name = "%s"
   parent       = "organizations/%s"
 }
+
 `, pid, projectName, folderName, org)
 }
 
diff --git a/google/resource_google_service_account_iam_test.go b/google/resource_google_service_account_iam_test.go
index abe33282554..fcd912222d8 100644
--- a/google/resource_google_service_account_iam_test.go
+++ b/google/resource_google_service_account_iam_test.go
@@ -112,9 +112,9 @@ resource "google_service_account" "test_account" {
 }
 
 resource "google_service_account_iam_binding" "foo" {
-  service_account_id = google_service_account.test_account.name
-  role               = "roles/iam.serviceAccountUser"
-  members            = ["user:admin@hashicorptest.com"]
+  service_account_id = "${google_service_account.test_account.name}"
+  role        = "roles/iam.serviceAccountUser"
+  members     = ["user:admin@hashicorptest.com"]
 }
 `, account)
 }
@@ -127,9 +127,9 @@ resource "google_service_account" "test_account" {
 }
 
 resource "google_service_account_iam_member" "foo" {
-  service_account_id = google_service_account.test_account.name
-  role               = "roles/iam.serviceAccountUser"
-  member             = "serviceAccount:${google_service_account.test_account.email}"
+  service_account_id = "${google_service_account.test_account.name}"
+  role   = "roles/iam.serviceAccountUser"
+  member = "serviceAccount:${google_service_account.test_account.email}"
 }
 `, account)
 }
@@ -150,8 +150,8 @@ data "google_iam_policy" "foo" {
 }
 
 resource "google_service_account_iam_policy" "foo" {
-  service_account_id = google_service_account.test_account.name
-  policy_data        = data.google_iam_policy.foo.policy_data
+  service_account_id = "${google_service_account.test_account.name}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, account)
 }
diff --git a/google/resource_google_service_account_key_test.go b/google/resource_google_service_account_key_test.go
index ec68338e106..2c236906c8a 100644
--- a/google/resource_google_service_account_key_test.go
+++ b/google/resource_google_service_account_key_test.go
@@ -83,13 +83,13 @@ func testAccCheckGoogleServiceAccountKeyExists(r string) resource.TestCheckFunc
 func testAccServiceAccountKey(account, name string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "acceptance" {
-  account_id   = "%s"
-  display_name = "%s"
+	account_id = "%s"
+	display_name = "%s"
 }
 
 resource "google_service_account_key" "acceptance" {
-  service_account_id = google_service_account.acceptance.name
-  public_key_type    = "TYPE_X509_PEM_FILE"
+	service_account_id = "${google_service_account.acceptance.name}"
+	public_key_type = "TYPE_X509_PEM_FILE"
 }
 `, account, name)
 }
@@ -97,13 +97,13 @@ resource "google_service_account_key" "acceptance" {
 func testAccServiceAccountKey_fromEmail(account, name string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "acceptance" {
-  account_id   = "%s"
-  display_name = "%s"
+	account_id = "%s"
+	display_name = "%s"
 }
 
 resource "google_service_account_key" "acceptance" {
-  service_account_id = google_service_account.acceptance.email
-  public_key_type    = "TYPE_X509_PEM_FILE"
+	service_account_id = "${google_service_account.acceptance.email}"
+	public_key_type = "TYPE_X509_PEM_FILE"
 }
 `, account, name)
 }
diff --git a/google/resource_google_service_account_test.go b/google/resource_google_service_account_test.go
index c1d8941c079..a6649530a7c 100644
--- a/google/resource_google_service_account_test.go
+++ b/google/resource_google_service_account_test.go
@@ -95,9 +95,9 @@ func testAccStoreServiceAccountUniqueId(uniqueId *string) resource.TestCheckFunc
 func testAccServiceAccountBasic(account, name, desc string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "acceptance" {
-  account_id   = "%v"
-  display_name = "%v"
-  description  = "%v"
+    account_id = "%v"
+    display_name = "%v"
+    description = "%v"
 }
 `, account, name, desc)
 }
@@ -105,10 +105,10 @@ resource "google_service_account" "acceptance" {
 func testAccServiceAccountWithProject(project, account, name string) string {
 	return fmt.Sprintf(`
 resource "google_service_account" "acceptance" {
-  project      = "%v"
-  account_id   = "%v"
-  display_name = "%v"
-  description  = "foo"
+    project = "%v"
+    account_id = "%v"
+    display_name = "%v"
+    description = "foo"
 }
 `, project, account, name)
 }
diff --git a/google/resource_iam_binding.go b/google/resource_iam_binding.go
index 52be5263ec2..b98d25a09b6 100644
--- a/google/resource_iam_binding.go
+++ b/google/resource_iam_binding.go
@@ -4,9 +4,11 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"regexp"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"google.golang.org/api/cloudresourcemanager/v1"
 )
 
@@ -22,6 +24,7 @@ var iamBindingSchema = map[string]*schema.Schema{
 		Elem: &schema.Schema{
 			Type:             schema.TypeString,
 			DiffSuppressFunc: caseDiffSuppress,
+			ValidateFunc:     validation.StringDoesNotMatch(regexp.MustCompile("^deleted:"), "Terraform does not support IAM bindings for deleted principals"),
 		},
 		Set: func(v interface{}) int {
 			return schema.HashString(strings.ToLower(v.(string)))
diff --git a/google/resource_iam_member.go b/google/resource_iam_member.go
index 0a056206be4..06e8f5afcc0 100644
--- a/google/resource_iam_member.go
+++ b/google/resource_iam_member.go
@@ -4,9 +4,11 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"regexp"
 	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"google.golang.org/api/cloudresourcemanager/v1"
 )
 
@@ -21,6 +23,7 @@ var IamMemberBaseSchema = map[string]*schema.Schema{
 		Required:         true,
 		ForceNew:         true,
 		DiffSuppressFunc: caseDiffSuppress,
+		ValidateFunc:     validation.StringDoesNotMatch(regexp.MustCompile("^deleted:"), "Terraform does not support IAM members for deleted principals"),
 	},
 	"etag": {
 		Type:     schema.TypeString,
diff --git a/google/resource_kms_crypto_key_iam_test.go b/google/resource_kms_crypto_key_iam_test.go
index dcfbf9724ad..a797521d8e7 100644
--- a/google/resource_kms_crypto_key_iam_test.go
+++ b/google/resource_kms_crypto_key_iam_test.go
@@ -182,34 +182,34 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   location = "us-central1"
   name     = "%s"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  key_ring = google_kms_key_ring.key_ring.id
+  key_ring = "${google_kms_key_ring.key_ring.id}"
   name     = "%s"
 }
 
 resource "google_kms_crypto_key_iam_binding" "foo" {
-  crypto_key_id = google_kms_crypto_key.crypto_key.id
+  crypto_key_id = "${google_kms_crypto_key.crypto_key.id}"
   role          = "%s"
   members       = ["serviceAccount:${google_service_account.test_account.email}"]
 }
@@ -226,44 +226,44 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_service_account" "test_account_2" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s-2"
   display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project  = "${google_project_service.iam.project}"
   location = "us-central1"
   name     = "%s"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  key_ring = google_kms_key_ring.key_ring.id
+  key_ring = "${google_kms_key_ring.key_ring.id}"
   name     = "%s"
 }
 
 resource "google_kms_crypto_key_iam_binding" "foo" {
-  crypto_key_id = google_kms_crypto_key.crypto_key.id
+  crypto_key_id = "${google_kms_crypto_key.crypto_key.id}"
   role          = "%s"
-  members = [
+  members       = [
     "serviceAccount:${google_service_account.test_account.email}",
-    "serviceAccount:${google_service_account.test_account_2.email}",
+    "serviceAccount:${google_service_account.test_account_2.email}"
   ]
 }
 `, projectId, orgId, billingAccount, account, account, keyRingName, cryptoKeyName, roleId)
@@ -279,34 +279,33 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Crypto Key Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project  = "${google_project_service.iam.project}"
   location = "us-central1"
   name     = "%s"
 }
-
 resource "google_kms_crypto_key" "crypto_key" {
-  key_ring = google_kms_key_ring.key_ring.id
+  key_ring = "${google_kms_key_ring.key_ring.id}"
   name     = "%s"
 }
 
 resource "google_kms_crypto_key_iam_member" "foo" {
-  crypto_key_id = google_kms_crypto_key.crypto_key.id
+  crypto_key_id = "${google_kms_crypto_key.crypto_key.id}"
   role          = "%s"
   member        = "serviceAccount:${google_service_account.test_account.email}"
 }
diff --git a/google/resource_kms_crypto_key_test.go b/google/resource_kms_crypto_key_test.go
index c5d0322d727..7307dfa7b3e 100644
--- a/google/resource_kms_crypto_key_test.go
+++ b/google/resource_kms_crypto_key_test.go
@@ -365,138 +365,138 @@ func testAccCheckGoogleKmsCryptoKeyRotationDisabled(projectId, location, keyRing
 func testGoogleKmsCryptoKey_basic(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name            = "%s"
+	project_id      = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  name     = "%s"
-  key_ring = google_kms_key_ring.key_ring.self_link
-  labels = {
-    key = "value"
-  }
+	name            = "%s"
+	key_ring        = "${google_kms_key_ring.key_ring.self_link}"
+	labels = {
+		key = "value"
+	}
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName)
 }
 
 func testGoogleKmsCryptoKey_rotation(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, rotationPeriod string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name            = "%s"
+	project_id      = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  name            = "%s"
-  key_ring        = google_kms_key_ring.key_ring.self_link
-  rotation_period = "%s"
+	name            = "%s"
+	key_ring        = "${google_kms_key_ring.key_ring.self_link}"
+	rotation_period = "%s"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, rotationPeriod)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, rotationPeriod)
 }
 
 func testGoogleKmsCryptoKey_rotationRemoved(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name            = "%s"
+	project_id      = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  name     = "%s"
-  key_ring = google_kms_key_ring.key_ring.self_link
+	name            = "%s"
+	key_ring        = "${google_kms_key_ring.key_ring.self_link}"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName)
 }
 
 func testGoogleKmsCryptoKey_template(projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, algorithm string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name            = "%s"
+	project_id      = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  name     = "%s"
-  key_ring = google_kms_key_ring.key_ring.self_link
-  purpose  = "ASYMMETRIC_SIGN"
+	name            = "%s"
+	key_ring        = "${google_kms_key_ring.key_ring.self_link}"
+	purpose  = "ASYMMETRIC_SIGN"
 
-  version_template {
-    algorithm = "%s"
-  }
+	version_template {
+		algorithm = "%s"
+	}
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, algorithm)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName, cryptoKeyName, algorithm)
 }
 
 func testGoogleKmsCryptoKey_removed(projectId, projectOrg, projectBillingAccount, keyRingName string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name            = "%s"
+	project_id      = "%s"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName)
 }
diff --git a/google/resource_kms_key_ring_iam_test.go b/google/resource_kms_key_ring_iam_test.go
index e80add2c086..2f884db6c12 100644
--- a/google/resource_kms_key_ring_iam_test.go
+++ b/google/resource_kms_key_ring_iam_test.go
@@ -174,29 +174,29 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   location = "us-central1"
   name     = "%s"
 }
 
 resource "google_kms_key_ring_iam_binding" "foo" {
-  key_ring_id = google_kms_key_ring.key_ring.id
+  key_ring_id = "${google_kms_key_ring.key_ring.id}"
   role        = "%s"
   members     = ["serviceAccount:${google_service_account.test_account.email}"]
 }
@@ -213,39 +213,39 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_service_account" "test_account_2" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s-2"
   display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project  = "${google_project_service.iam.project}"
   location = "%s"
   name     = "%s"
 }
 
 resource "google_kms_key_ring_iam_binding" "foo" {
-  key_ring_id = google_kms_key_ring.key_ring.id
-  role        = "%s"
-  members = [
+  key_ring_id  = "${google_kms_key_ring.key_ring.id}"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test_account.email}",
-    "serviceAccount:${google_service_account.test_account_2.email}",
+    "serviceAccount:${google_service_account.test_account_2.email}"
   ]
 }
 `, projectId, orgId, billingAccount, account, account, DEFAULT_KMS_TEST_LOCATION, keyRingName, roleId)
@@ -261,29 +261,29 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project  = "${google_project_service.iam.project}"
   location = "%s"
   name     = "%s"
 }
 
 resource "google_kms_key_ring_iam_member" "foo" {
-  key_ring_id = google_kms_key_ring.key_ring.id
+  key_ring_id = "${google_kms_key_ring.key_ring.id}"
   role        = "%s"
   member      = "serviceAccount:${google_service_account.test_account.email}"
 }
@@ -300,38 +300,38 @@ resource "google_project" "test_project" {
 }
 
 resource "google_project_service" "kms" {
-  project = google_project.test_project.project_id
+  project = "${google_project.test_project.project_id}"
   service = "cloudkms.googleapis.com"
 }
 
 resource "google_project_service" "iam" {
-  project = google_project_service.kms.project
+  project = "${google_project_service.kms.project}"
   service = "iam.googleapis.com"
 }
 
 resource "google_service_account" "test_account" {
-  project      = google_project_service.iam.project
+  project      = "${google_project_service.iam.project}"
   account_id   = "%s"
   display_name = "Kms Key Ring Iam Testing Account"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.iam.project
+  project  = "${google_project_service.iam.project}"
   location = "%s"
   name     = "%s"
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role = "%s"
+	binding {
+		role = "%s"
 
-    members = ["serviceAccount:${google_service_account.test_account.email}"]
-  }
+		members = ["serviceAccount:${google_service_account.test_account.email}"]
+	}
 }
 
 resource "google_kms_key_ring_iam_policy" "foo" {
-  key_ring_id = google_kms_key_ring.key_ring.id
-  policy_data = data.google_iam_policy.foo.policy_data
+  key_ring_id = "${google_kms_key_ring.key_ring.id}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, projectId, orgId, billingAccount, account, DEFAULT_KMS_TEST_LOCATION, keyRingName, roleId)
 }
diff --git a/google/resource_kms_key_ring_test.go b/google/resource_kms_key_ring_test.go
index 51a585befc4..b0c5a087c80 100644
--- a/google/resource_kms_key_ring_test.go
+++ b/google/resource_kms_key_ring_test.go
@@ -123,37 +123,37 @@ func testAccCheckGoogleKmsKeyRingWasRemovedFromState(resourceName string) resour
 func testGoogleKmsKeyRing_basic(projectId, projectOrg, projectBillingAccount, keyRingName string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name			= "%s"
+	project_id		= "%s"
+	org_id			= "%s"
+	billing_account	= "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project  = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  project  = google_project_service.acceptance.project
-  name     = "%s"
-  location = "us-central1"
+	project  = "${google_project_service.acceptance.project}"
+	name     = "%s"
+	location = "us-central1"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName)
+	`, projectId, projectId, projectOrg, projectBillingAccount, keyRingName)
 }
 
 func testGoogleKmsKeyRing_removed(projectId, projectOrg, projectBillingAccount string) string {
 	return fmt.Sprintf(`
 resource "google_project" "acceptance" {
-  name            = "%s"
-  project_id      = "%s"
-  org_id          = "%s"
-  billing_account = "%s"
+	name 			= "%s"
+	project_id		= "%s"
+	org_id			= "%s"
+	billing_account	= "%s"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project  = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
-`, projectId, projectId, projectOrg, projectBillingAccount)
+	`, projectId, projectId, projectOrg, projectBillingAccount)
 }
diff --git a/google/resource_logging_billing_account_exclusion_test.go b/google/resource_logging_billing_account_exclusion_test.go
index ad87216cb4b..b4a795f5d86 100644
--- a/google/resource_logging_billing_account_exclusion_test.go
+++ b/google/resource_logging_billing_account_exclusion_test.go
@@ -136,10 +136,10 @@ func testAccCheckLoggingBillingAccountExclusionDestroy(s *terraform.State) error
 func testAccLoggingBillingAccountExclusion_basicCfg(exclusionName, description, billingAccount string) string {
 	return fmt.Sprintf(`
 resource "google_logging_billing_account_exclusion" "basic" {
-  name            = "%s"
-  billing_account = "%s"
-  description     = "%s"
-  filter          = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name             = "%s"
+	billing_account  = "%s"
+	description      = "%s"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 `, exclusionName, billingAccount, description, getTestProjectFromEnv())
 }
diff --git a/google/resource_logging_billing_account_sink_test.go b/google/resource_logging_billing_account_sink_test.go
index 040f752738f..bc87af8bb9d 100644
--- a/google/resource_logging_billing_account_sink_test.go
+++ b/google/resource_logging_billing_account_sink_test.go
@@ -176,51 +176,48 @@ func testAccCheckLoggingBillingAccountSink(sink *logging.LogSink, n string) reso
 func testAccLoggingBillingAccountSink_basic(name, bucketName, billingAccount string) string {
 	return fmt.Sprintf(`
 resource "google_logging_billing_account_sink" "basic" {
-  name            = "%s"
-  billing_account = "%s"
-  destination     = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter          = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name = "%s"
+	billing_account = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, name, billingAccount, getTestProjectFromEnv(), bucketName)
+	name     = "%s"
+}`, name, billingAccount, getTestProjectFromEnv(), bucketName)
 }
 
 func testAccLoggingBillingAccountSink_update(name, bucketName, billingAccount string) string {
 	return fmt.Sprintf(`
 resource "google_logging_billing_account_sink" "update" {
-  name            = "%s"
-  billing_account = "%s"
-  destination     = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter          = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name = "%s"
+	billing_account = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, name, billingAccount, getTestProjectFromEnv(), bucketName)
+	name     = "%s"
+}`, name, billingAccount, getTestProjectFromEnv(), bucketName)
 }
 
 func testAccLoggingBillingAccountSink_heredoc(name, bucketName, billingAccount string) string {
 	return fmt.Sprintf(`
 resource "google_logging_billing_account_sink" "heredoc" {
-  name            = "%s"
-  billing_account = "%s"
-  destination     = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter          = <<EOS
+	name = "%s"
+	billing_account = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter = <<EOS
 
 	logName="projects/%s/logs/compute.googleapis.com%%2Factivity_log"
 AND severity>=ERROR
 
 
-EOS
 
+  EOS
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, name, billingAccount, getTestProjectFromEnv(), bucketName)
+	name     = "%s"
+}`, name, billingAccount, getTestProjectFromEnv(), bucketName)
 }
diff --git a/google/resource_logging_folder_exclusion_test.go b/google/resource_logging_folder_exclusion_test.go
index e268d699da5..2f5244cd057 100644
--- a/google/resource_logging_folder_exclusion_test.go
+++ b/google/resource_logging_folder_exclusion_test.go
@@ -185,33 +185,31 @@ func testAccCheckLoggingFolderExclusionDestroy(s *terraform.State) error {
 func testAccLoggingFolderExclusion_basicCfg(exclusionName, description, folderName, folderParent string) string {
 	return fmt.Sprintf(`
 resource "google_logging_folder_exclusion" "basic" {
-  name        = "%s"
-  folder      = element(split("/", google_folder.my-folder.name), 1)
-  description = "%s"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name             = "%s"
+	folder           = "${element(split("/", google_folder.my-folder.name), 1)}"
+	description      = "%s"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 
 resource "google_folder" "my-folder" {
-  display_name = "%s"
-  parent       = "%s"
-}
-`, exclusionName, description, getTestProjectFromEnv(), folderName, folderParent)
+	display_name = "%s"
+	parent       = "%s"
+}`, exclusionName, description, getTestProjectFromEnv(), folderName, folderParent)
 }
 
 func testAccLoggingFolderExclusion_withFullFolderPath(exclusionName, description, folderName, folderParent string) string {
 	return fmt.Sprintf(`
 resource "google_logging_folder_exclusion" "full-folder" {
-  name        = "%s"
-  folder      = google_folder.my-folder.name
-  description = "%s"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name             = "%s"
+	folder           = "${google_folder.my-folder.name}"
+	description      = "%s"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 
 resource "google_folder" "my-folder" {
-  display_name = "%s"
-  parent       = "%s"
-}
-`, exclusionName, description, getTestProjectFromEnv(), folderName, folderParent)
+	display_name = "%s"
+	parent       = "%s"
+}`, exclusionName, description, getTestProjectFromEnv(), folderName, folderParent)
 }
 
 func testAccLoggingFolderExclusion_multipleCfg(folderName, folderParent string) string {
@@ -225,10 +223,10 @@ resource "google_folder" "my-folder" {
 	for i := 0; i < 3; i++ {
 		s += fmt.Sprintf(`
 resource "google_logging_folder_exclusion" "basic%d" {
-  name        = "%s"
-  folder      = element(split("/", google_folder.my-folder.name), 1)
-  description = "Basic Folder Logging Exclusion"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name        = "%s"
+	folder      = "${element(split("/", google_folder.my-folder.name), 1)}"
+	description = "Basic Folder Logging Exclusion"
+	filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 `, i, "tf-test-exclusion-"+acctest.RandString(10), getTestProjectFromEnv())
 	}
diff --git a/google/resource_logging_folder_sink_test.go b/google/resource_logging_folder_sink_test.go
index ea5f5f06386..1af933da522 100644
--- a/google/resource_logging_folder_sink_test.go
+++ b/google/resource_logging_folder_sink_test.go
@@ -222,70 +222,66 @@ func testAccCheckLoggingFolderSink(sink *logging.LogSink, n string) resource.Tes
 func testAccLoggingFolderSink_basic(sinkName, bucketName, folderName, folderParent string) string {
 	return fmt.Sprintf(`
 resource "google_logging_folder_sink" "basic" {
-  name             = "%s"
-  folder           = element(split("/", google_folder.my-folder.name), 1)
-  destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-  include_children = true
+	name             = "%s"
+	folder           = "${element(split("/", google_folder.my-folder.name), 1)}"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	include_children = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_folder" "my-folder" {
-  display_name = "%s"
-  parent       = "%s"
-}
-`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
+	display_name = "%s"
+    parent       = "%s"
+}`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
 }
 
 func testAccLoggingFolderSink_withFullFolderPath(sinkName, bucketName, folderName, folderParent string) string {
 	return fmt.Sprintf(`
 resource "google_logging_folder_sink" "basic" {
-  name             = "%s"
-  folder           = google_folder.my-folder.name
-  destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-  include_children = false
+	name             = "%s"
+	folder           = "${google_folder.my-folder.name}"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	include_children = false
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_folder" "my-folder" {
-  display_name = "%s"
-  parent       = "%s"
-}
-`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
+	display_name = "%s"
+    parent       = "%s"
+}`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
 }
 
 func testAccLoggingFolderSink_heredoc(sinkName, bucketName, folderName, folderParent string) string {
 	return fmt.Sprintf(`
 resource "google_logging_folder_sink" "heredoc" {
-  name        = "%s"
-  folder      = element(split("/", google_folder.my-folder.name), 1)
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter      = <<EOS
+	name             = "%s"
+	folder           = "${element(split("/", google_folder.my-folder.name), 1)}"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = <<EOS
 
 	logName="projects/%s/logs/compute.googleapis.com%%2Factivity_log"
 AND severity>=ERROR
 
 
 
-EOS
-
-  include_children = true
+  EOS
+	include_children = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_folder" "my-folder" {
-  display_name = "%s"
-  parent       = "%s"
-}
-`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
+	display_name = "%s"
+    parent       = "%s"
+}`, sinkName, getTestProjectFromEnv(), bucketName, folderName, folderParent)
 }
diff --git a/google/resource_logging_metric_test.go b/google/resource_logging_metric_test.go
index 3c4c57c9e40..62bd5763757 100644
--- a/google/resource_logging_metric_test.go
+++ b/google/resource_logging_metric_test.go
@@ -66,21 +66,20 @@ func TestAccLoggingMetric_explicitBucket(t *testing.T) {
 func testAccLoggingMetric_update(suffix string, filter string) string {
 	return fmt.Sprintf(`
 resource "google_logging_metric" "logging_metric" {
-  name   = "my-custom-metric-%s"
-  filter = "%s"
-  metric_descriptor {
-    metric_kind  = "DELTA"
-    value_type   = "INT64"
-    display_name = "My metric"
-  }
-}
-`, suffix, filter)
+	name = "my-custom-metric-%s"
+	filter = "%s"
+	metric_descriptor {
+		metric_kind = "DELTA"
+		value_type = "INT64"
+		display_name = "My metric"
+	}
+}`, suffix, filter)
 }
 
 func testAccLoggingMetric_explicitBucket(suffix string, filter string) string {
 	return fmt.Sprintf(`
 resource "google_logging_metric" "logging_metric" {
-  name   = "my-custom-metric-%s"
+  name = "my-custom-metric-%s"
   filter = "%s"
 
   metric_descriptor {
@@ -92,9 +91,8 @@ resource "google_logging_metric" "logging_metric" {
 
   bucket_options {
     explicit_buckets {
-      bounds = [0, 1, 2, 3, 4.2]
+      bounds = [0,1,2,3,4.2]
     }
   }
-}
-`, suffix, filter)
+}`, suffix, filter)
 }
diff --git a/google/resource_logging_organization_exclusion_test.go b/google/resource_logging_organization_exclusion_test.go
index 5d77fb2125b..ebaecc82b25 100644
--- a/google/resource_logging_organization_exclusion_test.go
+++ b/google/resource_logging_organization_exclusion_test.go
@@ -136,10 +136,10 @@ func testAccCheckLoggingOrganizationExclusionDestroy(s *terraform.State) error {
 func testAccLoggingOrganizationExclusion_basicCfg(exclusionName, description, orgId string) string {
 	return fmt.Sprintf(`
 resource "google_logging_organization_exclusion" "basic" {
-  name        = "%s"
-  org_id      = "%s"
-  description = "%s"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name             = "%s"
+	org_id           = "%s"
+	description      = "%s"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 }
 `, exclusionName, orgId, description, getTestProjectFromEnv())
 }
diff --git a/google/resource_logging_organization_sink_test.go b/google/resource_logging_organization_sink_test.go
index 7d2d9688ed8..a4d44c255af 100644
--- a/google/resource_logging_organization_sink_test.go
+++ b/google/resource_logging_organization_sink_test.go
@@ -188,55 +188,51 @@ func testAccCheckLoggingOrganizationSink(sink *logging.LogSink, n string) resour
 func testAccLoggingOrganizationSink_basic(sinkName, bucketName, orgId string) string {
 	return fmt.Sprintf(`
 resource "google_logging_organization_sink" "basic" {
-  name             = "%s"
-  org_id           = "%s"
-  destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-  include_children = true
+	name             = "%s"
+	org_id           = "%s"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	include_children = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
+	name = "%s"
+}`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
 }
 
 func testAccLoggingOrganizationSink_update(sinkName, bucketName, orgId string) string {
 	return fmt.Sprintf(`
 resource "google_logging_organization_sink" "update" {
-  name             = "%s"
-  org_id           = "%s"
-  destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-  include_children = false
+	name             = "%s"
+	org_id           = "%s"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	include_children = false
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
+	name     = "%s"
+}`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
 }
 
 func testAccLoggingOrganizationSink_heredoc(sinkName, bucketName, orgId string) string {
 	return fmt.Sprintf(`
 resource "google_logging_organization_sink" "heredoc" {
-  name        = "%s"
-  org_id      = "%s"
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter      = <<EOS
+	name             = "%s"
+	org_id           = "%s"
+	destination      = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter           = <<EOS
 
 	logName="projects/%s/logs/compute.googleapis.com%%2Factivity_log"
 AND severity>=ERROR
 
 
 
-EOS
-
-  include_children = true
+  EOS
+	include_children = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
-}
-`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
+	name = "%s"
+}`, sinkName, orgId, getTestProjectFromEnv(), bucketName)
 }
diff --git a/google/resource_logging_project_exclusion_test.go b/google/resource_logging_project_exclusion_test.go
index a83a7e414a0..aac52ab0178 100644
--- a/google/resource_logging_project_exclusion_test.go
+++ b/google/resource_logging_project_exclusion_test.go
@@ -158,32 +158,29 @@ func testAccCheckLoggingProjectExclusionDestroy(s *terraform.State) error {
 func testAccLoggingProjectExclusion_basicCfg(name string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_exclusion" "basic" {
-  name        = "%s"
-  description = "Basic Project Logging Exclusion"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-}
-`, name, getTestProjectFromEnv())
+	name = "%s"
+	description = "Basic Project Logging Exclusion"
+	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+}`, name, getTestProjectFromEnv())
 }
 
 func testAccLoggingProjectExclusion_basicUpdated(name string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_exclusion" "basic" {
-  name        = "%s"
-  description = "Basic Project Logging Exclusion"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=INFO"
-}
-`, name, getTestProjectFromEnv())
+	name = "%s"
+	description = "Basic Project Logging Exclusion"
+	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=INFO"
+}`, name, getTestProjectFromEnv())
 }
 
 func testAccLoggingProjectExclusion_basicDisabled(name string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_exclusion" "basic" {
-  name        = "%s"
-  description = ""
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
-  disabled    = true
-}
-`, name, getTestProjectFromEnv())
+	name = "%s"
+	description = ""
+	filter = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	disabled = true
+}`, name, getTestProjectFromEnv())
 }
 
 func testAccLoggingProjectExclusion_multipleCfg() string {
diff --git a/google/resource_logging_project_sink_test.go b/google/resource_logging_project_sink_test.go
index 938f26741dc..99e7dc7cbb1 100644
--- a/google/resource_logging_project_sink_test.go
+++ b/google/resource_logging_project_sink_test.go
@@ -109,16 +109,16 @@ func testAccCheckLoggingProjectSinkDestroy(s *terraform.State) error {
 func testAccLoggingProjectSink_basic(name, project, bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_sink" "basic" {
-  name        = "%s"
-  project     = "%s"
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name        = "%s"
+	project     = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 
-  unique_writer_identity = false
+	unique_writer_identity = false
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 `, name, project, project, bucketName)
 }
@@ -126,15 +126,15 @@ resource "google_storage_bucket" "log-bucket" {
 func testAccLoggingProjectSink_uniqueWriter(name, bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_sink" "unique_writer" {
-  name        = "%s"
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
+	name        = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=ERROR"
 
-  unique_writer_identity = true
+	unique_writer_identity = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 `, name, getTestProjectFromEnv(), bucketName)
 }
@@ -142,15 +142,15 @@ resource "google_storage_bucket" "log-bucket" {
 func testAccLoggingProjectSink_uniqueWriterUpdated(name, bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_sink" "unique_writer" {
-  name        = "%s"
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
-  filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=WARNING"
+	name        = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	filter      = "logName=\"projects/%s/logs/compute.googleapis.com%%2Factivity_log\" AND severity>=WARNING"
 
-  unique_writer_identity = true
+	unique_writer_identity = true
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 `, name, getTestProjectFromEnv(), bucketName)
 }
@@ -158,23 +158,22 @@ resource "google_storage_bucket" "log-bucket" {
 func testAccLoggingProjectSink_heredoc(name, project, bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_logging_project_sink" "heredoc" {
-  name        = "%s"
-  project     = "%s"
-  destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
+	name        = "%s"
+	project     = "%s"
+	destination = "storage.googleapis.com/${google_storage_bucket.log-bucket.name}"
 
-  filter = <<EOS
+	filter = <<EOS
 
 	logName="projects/%s/logs/compute.googleapis.com%%2Factivity_log"
 AND severity>=ERROR
 
+	EOS
 
-EOS
-
-  unique_writer_identity = false
+	unique_writer_identity = false
 }
 
 resource "google_storage_bucket" "log-bucket" {
-  name = "%s"
+	name = "%s"
 }
 `, name, project, project, bucketName)
 }
diff --git a/google/resource_monitoring_notification_channel_test.go b/google/resource_monitoring_notification_channel_test.go
index 5713cfa3f0b..c6aa24684a3 100644
--- a/google/resource_monitoring_notification_channel_test.go
+++ b/google/resource_monitoring_notification_channel_test.go
@@ -60,11 +60,10 @@ func testAccMonitoringNotificationChannel_update(channel, labels, enabled string
 	return fmt.Sprintf(`
 resource "google_monitoring_notification_channel" "update" {
   display_name = "IntTest Notification Channel"
-  type         = "%s"
+  type = "%s"
   labels = {
     %s
   }
-
   enabled = "%s"
 }
 `, channel, labels, enabled,
diff --git a/google/resource_monitoring_uptime_check_config_test.go b/google/resource_monitoring_uptime_check_config_test.go
index 889eca06318..7f967216fdc 100644
--- a/google/resource_monitoring_uptime_check_config_test.go
+++ b/google/resource_monitoring_uptime_check_config_test.go
@@ -86,7 +86,7 @@ func testAccMonitoringUptimeCheckConfig_update(path, project, pwd, host string)
 	return fmt.Sprintf(`
 resource "google_monitoring_uptime_check_config" "http" {
   display_name = "http-uptime-check-%s"
-  timeout      = "60s"
+  timeout = "60s"
 
   http_check {
     path = "/%s"
@@ -101,7 +101,7 @@ resource "google_monitoring_uptime_check_config" "http" {
     type = "uptime_url"
     labels = {
       project_id = "%s"
-      host       = "%s"
+      host = "%s"
     }
   }
 
diff --git a/google/resource_pubsub_subscription_iam_test.go b/google/resource_pubsub_subscription_iam_test.go
index a2eeac38742..0145e5f1017 100644
--- a/google/resource_pubsub_subscription_iam_test.go
+++ b/google/resource_pubsub_subscription_iam_test.go
@@ -142,7 +142,7 @@ resource "google_pubsub_topic" "topic" {
 
 resource "google_pubsub_subscription" "subscription" {
   name  = "%s"
-  topic = google_pubsub_topic.topic.id
+  topic = "${google_pubsub_topic.topic.id}"
 }
 
 resource "google_service_account" "test-account-1" {
@@ -151,9 +151,9 @@ resource "google_service_account" "test-account-1" {
 }
 
 resource "google_pubsub_subscription_iam_binding" "foo" {
-  subscription = google_pubsub_subscription.subscription.id
+  subscription = "${google_pubsub_subscription.subscription.id}"
   role         = "roles/pubsub.subscriber"
-  members = [
+  members      = [
     "serviceAccount:${google_service_account.test-account-1.email}",
   ]
 }
@@ -168,9 +168,10 @@ resource "google_pubsub_topic" "topic" {
 
 resource "google_pubsub_subscription" "subscription" {
   name  = "%s"
-  topic = google_pubsub_topic.topic.id
+  topic = "${google_pubsub_topic.topic.id}"
 }
 
+
 resource "google_service_account" "test-account-1" {
   account_id   = "%s-1"
   display_name = "Pubsub Subscription Iam Testing Account"
@@ -182,9 +183,9 @@ resource "google_service_account" "test-account-2" {
 }
 
 resource "google_pubsub_subscription_iam_binding" "foo" {
-  subscription = google_pubsub_subscription.subscription.id
+  subscription = "${google_pubsub_subscription.subscription.id}"
   role         = "roles/pubsub.subscriber"
-  members = [
+  members      = [
     "serviceAccount:${google_service_account.test-account-1.email}",
     "serviceAccount:${google_service_account.test-account-2.email}",
   ]
@@ -200,16 +201,17 @@ resource "google_pubsub_topic" "topic" {
 
 resource "google_pubsub_subscription" "subscription" {
   name  = "%s"
-  topic = google_pubsub_topic.topic.id
+  topic = "${google_pubsub_topic.topic.id}"
 }
 
+
 resource "google_service_account" "test-account" {
   account_id   = "%s"
   display_name = "Pubsub Subscription Iam Testing Account"
 }
 
 resource "google_pubsub_subscription_iam_member" "foo" {
-  subscription = google_pubsub_subscription.subscription.id
+  subscription = "${google_pubsub_subscription.subscription.id}"
   role         = "roles/pubsub.subscriber"
   member       = "serviceAccount:${google_service_account.test-account.email}"
 }
@@ -224,24 +226,25 @@ resource "google_pubsub_topic" "topic" {
 
 resource "google_pubsub_subscription" "subscription" {
   name  = "%s"
-  topic = google_pubsub_topic.topic.id
+  topic = "${google_pubsub_topic.topic.id}"
 }
 
+
 resource "google_service_account" "test-account" {
   account_id   = "%s"
   display_name = "Pubsub Subscription Iam Testing Account"
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role    = "%s"
-    members = ["serviceAccount:${google_service_account.test-account.email}"]
-  }
+	binding {
+		role    = "%s"
+		members = ["serviceAccount:${google_service_account.test-account.email}"]
+	}
 }
 
 resource "google_pubsub_subscription_iam_policy" "foo" {
-  subscription = google_pubsub_subscription.subscription.id
-  policy_data  = data.google_iam_policy.foo.policy_data
+  subscription = "${google_pubsub_subscription.subscription.id}"
+  policy_data  = "${data.google_iam_policy.foo.policy_data}"
 }
 `, topic, subscription, account, role)
 }
diff --git a/google/resource_pubsub_subscription_test.go b/google/resource_pubsub_subscription_test.go
index 161e1e10886..d7c7e2d8a2b 100644
--- a/google/resource_pubsub_subscription_test.go
+++ b/google/resource_pubsub_subscription_test.go
@@ -120,27 +120,26 @@ func TestAccPubsubSubscription_push(t *testing.T) {
 func testAccPubsubSubscription_emptyTTL(topic, subscription string) string {
 	return fmt.Sprintf(`
 resource "google_pubsub_topic" "foo" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_pubsub_subscription" "foo" {
-  name  = "%s"
-  topic = google_pubsub_topic.foo.id
-
-  message_retention_duration = "1200s"
-  retain_acked_messages      = true
-  ack_deadline_seconds       = 20
-  expiration_policy {
-    ttl = ""
-  }
+	name                 = "%s"
+	topic                = "${google_pubsub_topic.foo.id}"
+
+	message_retention_duration = "1200s"
+	retain_acked_messages = true
+	ack_deadline_seconds = 20
+	expiration_policy {
+		ttl = ""
+	}
 }
 `, topic, subscription)
 }
 
 func testAccPubsubSubscription_push(topicFoo string, subscription string) string {
 	return fmt.Sprintf(`
-data "google_project" "project" {
-}
+data "google_project" "project" {}
 
 resource "google_service_account" "pub_sub_service_account" {
   account_id = "my-super-service"
@@ -157,17 +156,17 @@ data "google_iam_policy" "admin" {
 }
 
 resource "google_pubsub_topic" "foo" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_pubsub_subscription" "foo" {
   name                 = "%s"
-  topic                = google_pubsub_topic.foo.name
+  topic                = "${google_pubsub_topic.foo.name}"
   ack_deadline_seconds = 10
   push_config {
     push_endpoint = "https://${data.google_project.project.project_id}.appspot.com"
     oidc_token {
-      service_account_email = google_service_account.pub_sub_service_account.email
+      service_account_email = "${google_service_account.pub_sub_service_account.email}"
     }
   }
 }
@@ -177,16 +176,16 @@ resource "google_pubsub_subscription" "foo" {
 func testAccPubsubSubscription_basic(topic, subscription, label string, deadline int) string {
 	return fmt.Sprintf(`
 resource "google_pubsub_topic" "foo" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_pubsub_subscription" "foo" {
-  name  = "%s"
-  topic = google_pubsub_topic.foo.id
-  labels = {
-    foo = "%s"
-  }
-  ack_deadline_seconds = %d
+	name                 = "%s"
+	topic                = "${google_pubsub_topic.foo.id}"
+	labels = {
+		foo = "%s"
+	}
+	ack_deadline_seconds = %d
 }
 `, topic, subscription, label, deadline)
 }
diff --git a/google/resource_pubsub_topic_iam_test.go b/google/resource_pubsub_topic_iam_test.go
index 2032e1e72c7..0ce034ea957 100644
--- a/google/resource_pubsub_topic_iam_test.go
+++ b/google/resource_pubsub_topic_iam_test.go
@@ -172,7 +172,7 @@ resource "google_service_account" "test-account-1" {
 
 resource "google_pubsub_topic_iam_binding" "foo" {
   project = "%s"
-  topic   = google_pubsub_topic.topic.name
+  topic   = "${google_pubsub_topic.topic.name}"
   role    = "roles/pubsub.publisher"
   members = [
     "serviceAccount:${google_service_account.test-account-1.email}",
@@ -194,8 +194,8 @@ resource "google_service_account" "test-account-1" {
 
 resource "google_pubsub_topic_iam_binding" "foo" {
   # use the id instead of the name because it's more compatible with import
-  topic = google_pubsub_topic.topic.id
-  role  = "roles/pubsub.publisher"
+  topic   = "${google_pubsub_topic.topic.id}"
+  role    = "roles/pubsub.publisher"
   members = [
     "serviceAccount:${google_service_account.test-account-1.email}",
   ]
@@ -221,8 +221,8 @@ resource "google_service_account" "test-account-2" {
 
 resource "google_pubsub_topic_iam_binding" "foo" {
   # use the id instead of the name because it's more compatible with import
-  topic = google_pubsub_topic.topic.id
-  role  = "roles/pubsub.publisher"
+  topic   = "${google_pubsub_topic.topic.id}"
+  role    = "roles/pubsub.publisher"
   members = [
     "serviceAccount:${google_service_account.test-account-1.email}",
     "serviceAccount:${google_service_account.test-account-2.email}",
@@ -243,8 +243,8 @@ resource "google_service_account" "test-account" {
 }
 
 resource "google_pubsub_topic_iam_member" "foo" {
-  topic  = google_pubsub_topic.topic.id
-  role   = "roles/pubsub.publisher"
+  topic = "${google_pubsub_topic.topic.id}"
+  role    = "roles/pubsub.publisher"
   member = "serviceAccount:${google_service_account.test-account.email}"
 }
 `, topic, account)
@@ -262,15 +262,15 @@ resource "google_service_account" "test-account" {
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role    = "%s"
-    members = ["serviceAccount:${google_service_account.test-account.email}"]
-  }
+	binding {
+		role = "%s"
+		members = ["serviceAccount:${google_service_account.test-account.email}"]
+	}
 }
 
 resource "google_pubsub_topic_iam_policy" "foo" {
-  topic       = google_pubsub_topic.topic.id
-  policy_data = data.google_iam_policy.foo.policy_data
+  topic = "${google_pubsub_topic.topic.id}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, topic, account, role)
 }
diff --git a/google/resource_pubsub_topic_test.go b/google/resource_pubsub_topic_test.go
index c1880660a20..d943681a9f7 100644
--- a/google/resource_pubsub_topic_test.go
+++ b/google/resource_pubsub_topic_test.go
@@ -66,10 +66,10 @@ func TestAccPubsubTopic_cmek(t *testing.T) {
 func testAccPubsubTopic_update(topic, key, value string) string {
 	return fmt.Sprintf(`
 resource "google_pubsub_topic" "foo" {
-  name = "%s"
-  labels = {
-    %s = "%s"
-  }
+	name = "%s"
+	labels = {
+		%s = "%s"
+	}
 }
 `, topic, key, value)
 }
@@ -77,16 +77,16 @@ resource "google_pubsub_topic" "foo" {
 func testAccPubsubTopic_updateWithRegion(topic, key, value, region string) string {
 	return fmt.Sprintf(`
 resource "google_pubsub_topic" "foo" {
-  name = "%s"
-  labels = {
-    %s = "%s"
-  }
+	name = "%s"
+	labels = {
+		%s = "%s"
+	}
 
-  message_storage_policy {
-    allowed_persistence_regions = [
-      "%s",
-    ]
-  }
+	message_storage_policy {
+		allowed_persistence_regions = [
+		  "%s",
+		]
+	}
 }
 `, topic, key, value, region)
 }
@@ -98,14 +98,14 @@ data "google_project" "project" {
 }
 
 resource "google_project_iam_member" "kms-project-binding" {
-  project = data.google_project.project.project_id
+  project = "${data.google_project.project.project_id}"
   role    = "roles/cloudkms.cryptoKeyEncrypterDecrypter"
   member  = "serviceAccount:service-${data.google_project.project.number}@gcp-sa-pubsub.iam.gserviceaccount.com"
 }
 
 resource "google_pubsub_topic" "topic" {
   name         = "%s"
-  project      = google_project_iam_member.kms-project-binding.project
+  project      = "${google_project_iam_member.kms-project-binding.project}"
   kms_key_name = "%s"
 }
 `, pid, topicName, kmsKey)
diff --git a/google/resource_redis_instance_test.go b/google/resource_redis_instance_test.go
index 6b9c6895ae3..939af9d69da 100644
--- a/google/resource_redis_instance_test.go
+++ b/google/resource_redis_instance_test.go
@@ -73,50 +73,47 @@ func TestAccRedisInstance_regionFromLocation(t *testing.T) {
 func testAccRedisInstance_update(name string) string {
 	return fmt.Sprintf(`
 resource "google_redis_instance" "test" {
-  name           = "%s"
-  display_name   = "pre-update"
-  memory_size_gb = 1
-  region         = "us-central1"
-
-  labels = {
-    my_key    = "my_val"
-    other_key = "other_val"
-  }
-
-  redis_configs = {
-    maxmemory-policy       = "allkeys-lru"
-    notify-keyspace-events = "KEA"
-  }
-}
-`, name)
+	name           = "%s"
+	display_name   = "pre-update"
+	memory_size_gb = 1
+	region         = "us-central1"
+
+	labels = {
+		my_key    = "my_val"
+		other_key = "other_val"
+	}
+
+	redis_configs = {
+		maxmemory-policy       = "allkeys-lru"
+		notify-keyspace-events = "KEA"
+	}
+}`, name)
 }
 
 func testAccRedisInstance_update2(name string) string {
 	return fmt.Sprintf(`
 resource "google_redis_instance" "test" {
-  name           = "%s"
-  display_name   = "post-update"
-  memory_size_gb = 1
-
-  labels = {
-    my_key    = "my_val"
-    other_key = "new_val"
-  }
-
-  redis_configs = {
-    maxmemory-policy       = "noeviction"
-    notify-keyspace-events = ""
-  }
-}
-`, name)
+	name           = "%s"
+	display_name   = "post-update"
+	memory_size_gb = 1
+
+	labels = {
+		my_key    = "my_val"
+		other_key = "new_val"
+	}
+
+	redis_configs = {
+		maxmemory-policy       = "noeviction"
+		notify-keyspace-events = ""
+	}
+}`, name)
 }
 
 func testAccRedisInstance_regionFromLocation(name, zone string) string {
 	return fmt.Sprintf(`
 resource "google_redis_instance" "test" {
-  name           = "%s"
-  memory_size_gb = 1
-  location_id    = "%s"
-}
-`, name, zone)
+	name           = "%s"
+	memory_size_gb = 1
+	location_id    = "%s"
+}`, name, zone)
 }
diff --git a/google/resource_resourcemanager_lien_test.go b/google/resource_resourcemanager_lien_test.go
index c2975b03295..e89de32f17d 100644
--- a/google/resource_resourcemanager_lien_test.go
+++ b/google/resource_resourcemanager_lien_test.go
@@ -94,15 +94,15 @@ func testAccResourceManagerLien_basic(projectName, org string) string {
 	return fmt.Sprintf(`
 resource "google_project" "project" {
   project_id = "%s"
-  name       = "some test project"
-  org_id     = "%s"
+  name = "some test project"
+  org_id = "%s"
 }
 
 resource "google_resource_manager_lien" "lien" {
-  parent       = "projects/${google_project.project.project_id}"
+  parent = "projects/${google_project.project.project_id}"
   restrictions = ["resourcemanager.projects.delete"]
-  origin       = "something"
-  reason       = "something else"
+  origin = "something"
+  reason = "something else"
 }
 `, projectName, org)
 }
diff --git a/google/resource_runtimeconfig_config_test.go b/google/resource_runtimeconfig_config_test.go
index ee0f2bfc537..7f84f86606c 100644
--- a/google/resource_runtimeconfig_config_test.go
+++ b/google/resource_runtimeconfig_config_test.go
@@ -157,16 +157,14 @@ func testAccCheckRuntimeconfigConfigDestroy(s *terraform.State) error {
 func testAccRuntimeconfigConfig_basicDescription(name, description string) string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name        = "%s"
-  description = "%s"
-}
-`, name, description)
+ 	name = "%s"
+ 	description = "%s"
+}`, name, description)
 }
 
 func testAccRuntimeconfigConfig_emptyDescription(name string) string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "%s"
-}
-`, name)
+ 	name = "%s"
+}`, name)
 }
diff --git a/google/resource_runtimeconfig_variable_test.go b/google/resource_runtimeconfig_variable_test.go
index e0cc4dfa47c..4ee12dd3b5e 100644
--- a/google/resource_runtimeconfig_variable_test.go
+++ b/google/resource_runtimeconfig_variable_test.go
@@ -227,69 +227,64 @@ func testAccCheckRuntimeconfigVariableDestroy(s *terraform.State) error {
 func testAccRuntimeconfigVariable_basicText(name, text string) string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "some-config-%s"
+ 	name = "some-config-%s"
 }
 
 resource "google_runtimeconfig_variable" "foobar" {
-  parent = google_runtimeconfig_config.foobar.name
-  name   = "%s"
-  text   = "%s"
-}
-`, acctest.RandString(10), name, text)
+	parent = "${google_runtimeconfig_config.foobar.name}"
+	name = "%s"
+	text = "%s"
+}`, acctest.RandString(10), name, text)
 }
 
 func testAccRuntimeconfigVariable_basicTextUpdate(configName, name, text string) string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "%s"
+ 	name = "%s"
 }
 
 resource "google_runtimeconfig_variable" "foobar" {
-  parent = google_runtimeconfig_config.foobar.name
-  name   = "%s"
-  text   = "%s"
-}
-`, configName, name, text)
+	parent = "${google_runtimeconfig_config.foobar.name}"
+	name = "%s"
+	text = "%s"
+}`, configName, name, text)
 }
 
 func testAccRuntimeconfigVariable_basicValue(name, value string) string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "some-config-%s"
+ 	name = "some-config-%s"
 }
 
 resource "google_runtimeconfig_variable" "foobar" {
-  parent = google_runtimeconfig_config.foobar.name
-  name   = "%s"
-  value  = "%s"
-}
-`, acctest.RandString(10), name, value)
+	parent = "${google_runtimeconfig_config.foobar.name}"
+	name = "%s"
+	value = "%s"
+}`, acctest.RandString(10), name, value)
 }
 
 func testAccRuntimeconfigVariable_invalidBothTextValue() string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "some-config-%s"
+ 	name = "some-config-%s"
 }
 
 resource "google_runtimeconfig_variable" "foobar" {
-  parent = google_runtimeconfig_config.foobar.name
-  name   = "%s"
-  text   = "here's my value"
-  value  = "Zm9vYmFyCg=="
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	parent = "${google_runtimeconfig_config.foobar.name}"
+	name = "%s"
+	text = "here's my value"
+	value = "Zm9vYmFyCg=="
+}`, acctest.RandString(10), acctest.RandString(10))
 }
 
 func testAccRuntimeconfigVariable_invalidMissingTextValue() string {
 	return fmt.Sprintf(`
 resource "google_runtimeconfig_config" "foobar" {
-  name = "some-config-%s"
+ 	name = "some-config-%s"
 }
 
 resource "google_runtimeconfig_variable" "foobar" {
-  parent = google_runtimeconfig_config.foobar.name
-  name   = "my-variable-namespace/%s"
-}
-`, acctest.RandString(10), acctest.RandString(10))
+	parent = "${google_runtimeconfig_config.foobar.name}"
+	name = "my-variable-namespace/%s"
+}`, acctest.RandString(10), acctest.RandString(10))
 }
diff --git a/google/resource_service_networking_connection_test.go b/google/resource_service_networking_connection_test.go
index 65263055da9..cdec8d84f45 100644
--- a/google/resource_service_networking_connection_test.go
+++ b/google/resource_service_networking_connection_test.go
@@ -123,21 +123,21 @@ func testServiceNetworkingConnectionDestroy(parent, network, project string) res
 func testAccServiceNetworkingConnection(networkName, addressRangeName, serviceName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name = "%s"
+	name       = "%s"
 }
 
 resource "google_compute_global_address" "foobar" {
-  name          = "%s"
-  purpose       = "VPC_PEERING"
-  address_type  = "INTERNAL"
-  prefix_length = 16
-  network       = google_compute_network.foobar.self_link
+	name          = "%s"
+	purpose       = "VPC_PEERING"
+	address_type = "INTERNAL"
+	prefix_length = 16
+	network       = "${google_compute_network.foobar.self_link}"
 }
 
 resource "google_service_networking_connection" "foobar" {
-  network                 = google_compute_network.foobar.self_link
-  service                 = "%s"
-  reserved_peering_ranges = [google_compute_global_address.foobar.name]
+	network       = "${google_compute_network.foobar.self_link}"
+	service       = "%s"
+	reserved_peering_ranges = ["${google_compute_global_address.foobar.name}"]
 }
 `, networkName, addressRangeName, serviceName)
 }
@@ -145,15 +145,15 @@ resource "google_service_networking_connection" "foobar" {
 func testAccServiceNetworkingConnectionDestroy(networkName, addressRangeName string) string {
 	return fmt.Sprintf(`
 resource "google_compute_network" "foobar" {
-  name = "%s"
+	name       = "%s"
 }
 
 resource "google_compute_global_address" "foobar" {
-  name          = "%s"
-  purpose       = "VPC_PEERING"
-  address_type  = "INTERNAL"
-  prefix_length = 16
-  network       = google_compute_network.foobar.self_link
+	name          = "%s"
+	purpose       = "VPC_PEERING"
+	address_type = "INTERNAL"
+	prefix_length = 16
+	network       = "${google_compute_network.foobar.self_link}"
 }
 `, networkName, addressRangeName)
 }
diff --git a/google/resource_sourcerepo_repository_test.go b/google/resource_sourcerepo_repository_test.go
index cdb35bb6af4..cf799a06bc4 100644
--- a/google/resource_sourcerepo_repository_test.go
+++ b/google/resource_sourcerepo_repository_test.go
@@ -34,5 +34,5 @@ func testAccSourceRepoRepository_basic(repositoryName string) string {
 resource "google_sourcerepo_repository" "acceptance" {
   name = "%s"
 }
-`, repositoryName)
+	`, repositoryName)
 }
diff --git a/google/resource_spanner_database_iam_test.go b/google/resource_spanner_database_iam_test.go
index 294fb9f835e..e1da8b0b297 100644
--- a/google/resource_spanner_database_iam_test.go
+++ b/google/resource_spanner_database_iam_test.go
@@ -129,16 +129,16 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_database" "database" {
-  instance = google_spanner_instance.instance.name
+  instance = "${google_spanner_instance.instance.name}"
   name     = "%s"
 }
 
 resource "google_spanner_database_iam_binding" "foo" {
-  project  = google_spanner_database.database.project
-  database = google_spanner_database.database.name
-  instance = google_spanner_database.database.instance
-  role     = "%s"
-  members  = ["serviceAccount:${google_service_account.test_account.email}"]
+  project     = "${google_spanner_database.database.project}"
+  database    = "${google_spanner_database.database.name}"
+  instance    = "${google_spanner_database.database.instance}"
+  role        = "%s"
+  members     = ["serviceAccount:${google_service_account.test_account.email}"]
 }
 `, account, instance, instance, database, roleId)
 }
@@ -163,18 +163,18 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_database" "database" {
-  instance = google_spanner_instance.instance.name
+  instance = "${google_spanner_instance.instance.name}"
   name     = "%s"
 }
 
 resource "google_spanner_database_iam_binding" "foo" {
-  project  = google_spanner_database.database.project
-  database = google_spanner_database.database.name
-  instance = google_spanner_database.database.instance
-  role     = "%s"
-  members = [
+  project      = "${google_spanner_database.database.project}"
+  database     = "${google_spanner_database.database.name}"
+  instance     = "${google_spanner_database.database.instance}"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test_account.email}",
-    "serviceAccount:${google_service_account.test_account_2.email}",
+    "serviceAccount:${google_service_account.test_account_2.email}"
   ]
 }
 `, account, account, instance, instance, database, roleId)
@@ -195,16 +195,16 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_database" "database" {
-  instance = google_spanner_instance.instance.name
+  instance = "${google_spanner_instance.instance.name}"
   name     = "%s"
 }
 
 resource "google_spanner_database_iam_member" "foo" {
-  project  = google_spanner_database.database.project
-  database = google_spanner_database.database.name
-  instance = google_spanner_database.database.instance
-  role     = "%s"
-  member   = "serviceAccount:${google_service_account.test_account.email}"
+  project     = "${google_spanner_database.database.project}"
+  database    = "${google_spanner_database.database.name}"
+  instance    = "${google_spanner_database.database.instance}"
+  role        = "%s"
+  member      = "serviceAccount:${google_service_account.test_account.email}"
 }
 `, account, instance, instance, database, roleId)
 }
@@ -224,23 +224,23 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_database" "database" {
-  instance = google_spanner_instance.instance.name
+  instance = "${google_spanner_instance.instance.name}"
   name     = "%s"
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role = "%s"
+	binding {
+		role = "%s"
 
-    members = ["serviceAccount:${google_service_account.test_account.email}"]
-  }
+		members = ["serviceAccount:${google_service_account.test_account.email}"]
+	}
 }
 
 resource "google_spanner_database_iam_policy" "foo" {
-  project     = google_spanner_database.database.project
-  database    = google_spanner_database.database.name
-  instance    = google_spanner_database.database.instance
-  policy_data = data.google_iam_policy.foo.policy_data
+  project     = "${google_spanner_database.database.project}"
+  database    = "${google_spanner_database.database.name}"
+  instance    = "${google_spanner_database.database.instance}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, account, instance, instance, database, roleId)
 }
diff --git a/google/resource_spanner_database_test.go b/google/resource_spanner_database_test.go
index 530479a3413..a5fea593e6f 100644
--- a/google/resource_spanner_database_test.go
+++ b/google/resource_spanner_database_test.go
@@ -58,15 +58,15 @@ func TestAccSpannerDatabase_basic(t *testing.T) {
 func testAccSpannerDatabase_basic(instanceName, databaseName string) string {
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "basic" {
-  name         = "%s"
-  config       = "regional-us-central1"
-  display_name = "display-%s"
-  num_nodes    = 1
+  name          = "%s"
+  config        = "regional-us-central1"
+  display_name  = "display-%s"
+  num_nodes     = 1
 }
 
 resource "google_spanner_database" "basic" {
-  instance = google_spanner_instance.basic.name
-  name     = "%s"
+  instance      = "${google_spanner_instance.basic.name}"
+  name          = "%s"
 }
 `, instanceName, instanceName, databaseName)
 }
diff --git a/google/resource_spanner_instance_iam_test.go b/google/resource_spanner_instance_iam_test.go
index 854558b9f6d..753ab97d809 100644
--- a/google/resource_spanner_instance_iam_test.go
+++ b/google/resource_spanner_instance_iam_test.go
@@ -122,10 +122,10 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_instance_iam_binding" "foo" {
-  project  = google_spanner_instance.instance.project
-  instance = google_spanner_instance.instance.name
-  role     = "%s"
-  members  = ["serviceAccount:${google_service_account.test_account.email}"]
+  project     = "${google_spanner_instance.instance.project}"
+  instance    = "${google_spanner_instance.instance.name}"
+  role        = "%s"
+  members     = ["serviceAccount:${google_service_account.test_account.email}"]
 }
 `, account, instance, instance, roleId)
 }
@@ -150,12 +150,12 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_instance_iam_binding" "foo" {
-  project  = google_spanner_instance.instance.project
-  instance = google_spanner_instance.instance.name
-  role     = "%s"
-  members = [
+  project      = "${google_spanner_instance.instance.project}"
+  instance     = "${google_spanner_instance.instance.name}"
+  role         = "%s"
+  members      = [
     "serviceAccount:${google_service_account.test_account.email}",
-    "serviceAccount:${google_service_account.test_account_2.email}",
+    "serviceAccount:${google_service_account.test_account_2.email}"
   ]
 }
 `, account, account, instance, instance, roleId)
@@ -176,10 +176,10 @@ resource "google_spanner_instance" "instance" {
 }
 
 resource "google_spanner_instance_iam_member" "foo" {
-  project  = google_spanner_instance.instance.project
-  instance = google_spanner_instance.instance.name
-  role     = "%s"
-  member   = "serviceAccount:${google_service_account.test_account.email}"
+  project     = "${google_spanner_instance.instance.project}"
+  instance    = "${google_spanner_instance.instance.name}"
+  role        = "%s"
+  member      = "serviceAccount:${google_service_account.test_account.email}"
 }
 `, account, instance, instance, roleId)
 }
@@ -199,17 +199,17 @@ resource "google_spanner_instance" "instance" {
 }
 
 data "google_iam_policy" "foo" {
-  binding {
-    role = "%s"
+	binding {
+		role = "%s"
 
-    members = ["serviceAccount:${google_service_account.test_account.email}"]
-  }
+		members = ["serviceAccount:${google_service_account.test_account.email}"]
+	}
 }
 
 resource "google_spanner_instance_iam_policy" "foo" {
-  project     = google_spanner_instance.instance.project
-  instance    = google_spanner_instance.instance.name
-  policy_data = data.google_iam_policy.foo.policy_data
+  project     = "${google_spanner_instance.instance.project}"
+  instance = "${google_spanner_instance.instance.name}"
+  policy_data = "${data.google_iam_policy.foo.policy_data}"
 }
 `, account, instance, instance, roleId)
 }
diff --git a/google/resource_spanner_instance_test.go b/google/resource_spanner_instance_test.go
index e269036c351..a7b6de0dcea 100644
--- a/google/resource_spanner_instance_test.go
+++ b/google/resource_spanner_instance_test.go
@@ -129,10 +129,10 @@ func TestAccSpannerInstance_update(t *testing.T) {
 func testAccSpannerInstance_basic(name string) string {
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "basic" {
-  name         = "%s"
-  config       = "regional-us-central1"
-  display_name = "%s-dname"
-  num_nodes    = 1
+  name          = "%s"
+  config        = "regional-us-central1"
+  display_name  = "%s-dname"
+  num_nodes     = 1
 }
 `, name, name)
 }
@@ -140,9 +140,9 @@ resource "google_spanner_instance" "basic" {
 func testAccSpannerInstance_basicWithAutogenName(name string) string {
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "basic" {
-  config       = "regional-us-central1"
-  display_name = "%s"
-  num_nodes    = 1
+  config        = "regional-us-central1"
+  display_name  = "%s"
+  num_nodes     = 1
 }
 `, name)
 }
@@ -154,13 +154,13 @@ func testAccSpannerInstance_update(name string, nodes int, addLabel bool) string
 	}
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "updater" {
-  config       = "regional-us-central1"
-  display_name = "%s"
-  num_nodes    = %d
+  config        = "regional-us-central1"
+  display_name  = "%s"
+  num_nodes     = %d
 
   labels = {
-    "key1" = "value1"
-    %s
+     "key1" = "value1"
+     %s
   }
 }
 `, name, nodes, extraLabel)
diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
index 435660d4986..2472b54148e 100644
--- a/google/resource_sql_database_instance_test.go
+++ b/google/resource_sql_database_instance_test.go
@@ -632,84 +632,82 @@ func testAccCheckGoogleSqlDatabaseRootUserDoesNotExist(instance string) resource
 
 var testGoogleSqlDatabaseInstance_basic = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-  }
+	name = "tf-lw-%d"
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_basic2 = `
 resource "google_sql_database_instance" "instance" {
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-  }
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+	}
 }
 `
 var testGoogleSqlDatabaseInstance_basic3 = `
 resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central1"
-  settings {
-    tier = "db-f1-micro"
-  }
+	name = "%s"
+	region = "us-central1"
+	settings {
+		tier = "db-f1-micro"
+	}
 }
 `
 
 func testGoogleSqlDatabaseInstanceConfig_withoutReplica(instanceName string) string {
-	return fmt.Sprintf(`
-resource "google_sql_database_instance" "instance" {
-  name             = "%s"
-  region           = "us-central1"
-  database_version = "MYSQL_5_7"
+	return fmt.Sprintf(`resource "google_sql_database_instance" "instance" {
+  name               = "%s"
+  region             = "us-central1"
+  database_version   = "MYSQL_5_7"
 
   settings {
-    tier = "db-n1-standard-1"
+    tier             = "db-n1-standard-1"
 
     backup_configuration {
-      binary_log_enabled = "true"
-      enabled            = "true"
-      start_time         = "18:00"
+        binary_log_enabled = "true"
+        enabled            = "true"
+        start_time         = "18:00"
     }
   }
-}
-`, instanceName)
+}`, instanceName)
 }
 
 func testGoogleSqlDatabaseInstanceConfig_withReplica(instanceName, failoverName string) string {
 	return fmt.Sprintf(`
 resource "google_sql_database_instance" "instance" {
-  name             = "%s"
-  region           = "us-central1"
-  database_version = "MYSQL_5_7"
+  name               = "%s"
+  region             = "us-central1"
+  database_version   = "MYSQL_5_7"
 
   settings {
-    tier = "db-n1-standard-1"
+    tier             = "db-n1-standard-1"
 
     backup_configuration {
-      binary_log_enabled = "true"
-      enabled            = "true"
-      start_time         = "18:00"
+        binary_log_enabled = "true"
+        enabled            = "true"
+        start_time         = "18:00"
     }
   }
 }
 
 resource "google_sql_database_instance" "instance-failover" {
-  name                 = "%s"
-  region               = "us-central1"
-  database_version     = "MYSQL_5_7"
-  master_instance_name = google_sql_database_instance.instance.name
+  name               = "%s"
+  region             = "us-central1"
+  database_version   = "MYSQL_5_7"
+  master_instance_name = "${google_sql_database_instance.instance.name}"
 
   replica_configuration {
-    failover_target = "true"
+    failover_target        = "true"
   }
 
   settings {
-    tier = "db-n1-standard-1"
+    tier             = "db-n1-standard-1"
   }
 }
 `, instanceName, failoverName)
@@ -717,252 +715,252 @@ resource "google_sql_database_instance" "instance-failover" {
 
 var testGoogleSqlDatabaseInstance_settings = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-    replication_type       = "ASYNCHRONOUS"
-    location_preference {
-      zone = "us-central1-f"
-    }
+	name = "tf-lw-%d"
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+		replication_type = "ASYNCHRONOUS"
+		location_preference {
+			zone = "us-central1-f"
+		}
 
-    ip_configuration {
-      ipv4_enabled = "true"
-      authorized_networks {
-        value           = "108.12.12.12"
-        name            = "misc"
-        expiration_time = "2050-11-15T16:19:00.094Z"
-      }
-    }
+		ip_configuration {
+			ipv4_enabled = "true"
+			authorized_networks {
+				value = "108.12.12.12"
+				name = "misc"
+				expiration_time = "2050-11-15T16:19:00.094Z"
+			}
+		}
 
-    backup_configuration {
-      enabled    = "true"
-      start_time = "19:19"
-    }
+		backup_configuration {
+			enabled = "true"
+			start_time = "19:19"
+		}
 
-    activation_policy = "ON_DEMAND"
-  }
+		activation_policy = "ON_DEMAND"
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_replica = `
 resource "google_sql_database_instance" "instance_master" {
-  name             = "tf-lw-%d"
-  database_version = "MYSQL_5_6"
-  region           = "us-central1"
+	name = "tf-lw-%d"
+	database_version = "MYSQL_5_6"
+	region = "us-central1"
 
-  settings {
-    tier = "db-n1-standard-1"
+	settings {
+		tier = "db-n1-standard-1"
 
-    backup_configuration {
-      enabled            = true
-      start_time         = "00:00"
-      binary_log_enabled = true
-    }
-  }
+		backup_configuration {
+			enabled = true
+			start_time = "00:00"
+			binary_log_enabled = true
+		}
+	}
 }
 
 resource "google_sql_database_instance" "replica1" {
-  name             = "tf-lw-%d-1"
-  database_version = "MYSQL_5_6"
-  region           = "us-central1"
+	name = "tf-lw-%d-1"
+	database_version = "MYSQL_5_6"
+	region = "us-central1"
 
-  settings {
-    tier = "db-n1-standard-1"
-  }
+	settings {
+		tier = "db-n1-standard-1"
+	}
 
-  master_instance_name = google_sql_database_instance.instance_master.name
+	master_instance_name = "${google_sql_database_instance.instance_master.name}"
 
-  replica_configuration {
-    connect_retry_interval    = 100
-    master_heartbeat_period   = 10000
-    password                  = "password"
-    username                  = "username"
-    ssl_cipher                = "ALL"
-    verify_server_certificate = false
-  }
+	replica_configuration {
+		connect_retry_interval = 100
+		master_heartbeat_period = 10000
+		password = "password"
+		username = "username"
+		ssl_cipher = "ALL"
+		verify_server_certificate = false
+	}
 }
 
 resource "google_sql_database_instance" "replica2" {
-  name             = "tf-lw-%d-2"
-  database_version = "MYSQL_5_6"
-  region           = "us-central1"
+	name = "tf-lw-%d-2"
+	database_version = "MYSQL_5_6"
+	region = "us-central1"
 
-  settings {
-    tier = "db-n1-standard-1"
-  }
+	settings {
+		tier = "db-n1-standard-1"
+	}
 
-  master_instance_name = google_sql_database_instance.instance_master.name
+	master_instance_name = "${google_sql_database_instance.instance_master.name}"
 
-  replica_configuration {
-    connect_retry_interval    = 100
-    master_heartbeat_period   = 10000
-    password                  = "password"
-    username                  = "username"
-    ssl_cipher                = "ALL"
-    verify_server_certificate = false
-  }
+	replica_configuration {
+		connect_retry_interval = 100
+		master_heartbeat_period = 10000
+		password = "password"
+		username = "username"
+		ssl_cipher = "ALL"
+		verify_server_certificate = false
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_slave = `
 resource "google_sql_database_instance" "instance_master" {
-  name   = "tf-lw-%d"
-  region = "us-central1"
+	name = "tf-lw-%d"
+	region = "us-central1"
 
-  settings {
-    tier = "db-f1-micro"
+	settings {
+		tier = "db-f1-micro"
 
-    backup_configuration {
-      enabled            = true
-      binary_log_enabled = true
-    }
-  }
+		backup_configuration {
+			enabled = true
+			binary_log_enabled = true
+		}
+	}
 }
 
 resource "google_sql_database_instance" "instance_slave" {
-  name   = "tf-lw-%d"
-  region = "us-central1"
+	name = "tf-lw-%d"
+	region = "us-central1"
 
-  master_instance_name = google_sql_database_instance.instance_master.name
+	master_instance_name = "${google_sql_database_instance.instance_master.name}"
 
-  settings {
-    tier = "db-f1-micro"
-  }
+	settings {
+		tier = "db-f1-micro"
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_highAvailability = `
 resource "google_sql_database_instance" "instance" {
-  name             = "tf-lw-%d"
-  region           = "us-central1"
-  database_version = "POSTGRES_9_6"
+	name = "tf-lw-%d"
+	region = "us-central1"
+	database_version = "POSTGRES_9_6"
 
-  settings {
-    tier = "db-f1-micro"
+	settings {
+		tier = "db-f1-micro"
 
-    availability_type = "REGIONAL"
+		availability_type = "REGIONAL"
 
-    backup_configuration {
-      enabled  = true
-      location = "us"
-    }
-  }
+		backup_configuration {
+			enabled   = true
+			location  = "us"
+		}
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_diskspecs = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central1"
-
-  settings {
-    tier            = "db-f1-micro"
-    disk_autoresize = true
-    disk_size       = 15
-    disk_type       = "PD_HDD"
-  }
+	name = "tf-lw-%d"
+	region = "us-central1"
+
+	settings {
+		tier = "db-f1-micro"
+		disk_autoresize = true
+		disk_size = 15
+		disk_type = "PD_HDD"
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_maintenance = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central1"
+	name = "tf-lw-%d"
+	region = "us-central1"
 
-  settings {
-    tier = "db-f1-micro"
+	settings {
+		tier = "db-f1-micro"
 
-    maintenance_window {
-      day          = 7
-      hour         = 3
-      update_track = "canary"
-    }
-  }
+		maintenance_window {
+		  day  = 7
+		  hour = 3
+			update_track = "canary"
+	  }
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_authNets_step1 = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-
-    ip_configuration {
-      ipv4_enabled = "true"
-      authorized_networks {
-        value           = "108.12.12.12"
-        name            = "misc"
-        expiration_time = "2050-11-15T16:19:00.094Z"
-      }
-    }
-  }
+	name = "tf-lw-%d"
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+
+		ip_configuration {
+			ipv4_enabled = "true"
+			authorized_networks {
+				value = "108.12.12.12"
+				name = "misc"
+				expiration_time = "2050-11-15T16:19:00.094Z"
+			}
+		}
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_authNets_step2 = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-lw-%d"
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-
-    ip_configuration {
-      ipv4_enabled = "true"
-    }
-  }
+	name = "tf-lw-%d"
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+
+		ip_configuration {
+			ipv4_enabled = "true"
+		}
+	}
 }
 `
 
 var testGoogleSqlDatabaseInstance_multipleOperations = `
 resource "google_sql_database_instance" "instance" {
-  name   = "tf-test-%s"
-  region = "us-central"
-  settings {
-    tier                   = "D0"
-    crash_safe_replication = false
-  }
+	name = "tf-test-%s"
+	region = "us-central"
+	settings {
+		tier = "D0"
+		crash_safe_replication = false
+	}
 }
 
 resource "google_sql_database" "database" {
-  name     = "tf-test-%s"
-  instance = google_sql_database_instance.instance.name
+	name = "tf-test-%s"
+	instance = "${google_sql_database_instance.instance.name}"
 }
 
 resource "google_sql_user" "user" {
-  name     = "tf-test-%s"
-  instance = google_sql_database_instance.instance.name
-  host     = "google.com"
-  password = "hunter2"
+	name = "tf-test-%s"
+	instance = "${google_sql_database_instance.instance.name}"
+	host = "google.com"
+	password = "hunter2"
 }
 `
 
 var testGoogleSqlDatabaseInstance_basic_with_user_labels = `
 resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central1"
-  settings {
-    tier = "db-f1-micro"
-    user_labels = {
-      track    = "production"
-      location = "western-division"
-    }
-  }
+	name = "%s"
+	region = "us-central1"
+	settings {
+		tier = "db-f1-micro"
+		user_labels = {
+		    track = "production"
+		    location = "western-division"
+		}
+	}
 }
 `
 var testGoogleSqlDatabaseInstance_basic_with_user_labels_update = `
 resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central1"
-  settings {
-    tier = "db-f1-micro"
-    user_labels = {
-      track = "production"
-    }
-  }
+	name = "%s"
+	region = "us-central1"
+	settings {
+		tier = "db-f1-micro"
+		user_labels = {
+		    track = "production"
+		}
+	}
 }
 `
diff --git a/google/resource_sql_database_test.go b/google/resource_sql_database_test.go
index 9f21cbda03f..54ae79d727b 100644
--- a/google/resource_sql_database_test.go
+++ b/google/resource_sql_database_test.go
@@ -182,31 +182,31 @@ func testAccSqlDatabaseDestroy(s *terraform.State) error {
 
 var testGoogleSqlDatabase_basic = `
 resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central"
-  settings {
-    tier = "D0"
-  }
+	name = "%s"
+	region = "us-central"
+	settings {
+		tier = "D0"
+	}
 }
 
 resource "google_sql_database" "database" {
-  name     = "%s"
-  instance = google_sql_database_instance.instance.name
+	name = "%s"
+	instance = "${google_sql_database_instance.instance.name}"
 }
 `
 var testGoogleSqlDatabase_latin1 = `
 resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central"
-  settings {
-    tier = "D0"
-  }
+	name = "%s"
+	region = "us-central"
+	settings {
+		tier = "D0"
+	}
 }
 
 resource "google_sql_database" "database" {
-  name      = "%s"
-  instance  = google_sql_database_instance.instance.name
-  charset   = "latin1"
-  collation = "latin1_swedish_ci"
+	name = "%s"
+	instance = "${google_sql_database_instance.instance.name}"
+	charset = "latin1"
+	collation = "latin1_swedish_ci"
 }
 `
diff --git a/google/resource_sql_user_test.go b/google/resource_sql_user_test.go
index 5f837dd7793..8bdc74fb4da 100644
--- a/google/resource_sql_user_test.go
+++ b/google/resource_sql_user_test.go
@@ -132,46 +132,46 @@ func testAccSqlUserDestroy(s *terraform.State) error {
 
 func testGoogleSqlUser_mysql(instance, password string) string {
 	return fmt.Sprintf(`
-resource "google_sql_database_instance" "instance" {
-  name   = "%s"
-  region = "us-central"
-  settings {
-    tier = "D0"
-  }
-}
+	resource "google_sql_database_instance" "instance" {
+		name = "%s"
+		region = "us-central"
+		settings {
+			tier = "D0"
+		}
+	}
 
-resource "google_sql_user" "user1" {
-  name     = "admin"
-  instance = google_sql_database_instance.instance.name
-  host     = "google.com"
-  password = "%s"
-}
+	resource "google_sql_user" "user1" {
+		name = "admin"
+		instance = "${google_sql_database_instance.instance.name}"
+		host = "google.com"
+		password = "%s"
+	}
 
-resource "google_sql_user" "user2" {
-  name     = "admin"
-  instance = google_sql_database_instance.instance.name
-  host     = "gmail.com"
-  password = "hunter2"
-}
-`, instance, password)
+	resource "google_sql_user" "user2" {
+		name = "admin"
+		instance = "${google_sql_database_instance.instance.name}"
+		host = "gmail.com"
+		password = "hunter2"
+	}
+	`, instance, password)
 }
 
 func testGoogleSqlUser_postgres(instance, password string) string {
 	return fmt.Sprintf(`
-resource "google_sql_database_instance" "instance" {
-  name             = "%s"
-  region           = "us-central1"
-  database_version = "POSTGRES_9_6"
-
-  settings {
-    tier = "db-f1-micro"
-  }
-}
+	resource "google_sql_database_instance" "instance" {
+		name = "%s"
+		region = "us-central1"
+		database_version = "POSTGRES_9_6"
 
-resource "google_sql_user" "user" {
-  name     = "admin"
-  instance = google_sql_database_instance.instance.name
-  password = "%s"
-}
-`, instance, password)
+		settings {
+			tier = "db-f1-micro"
+		}
+	}
+
+	resource "google_sql_user" "user" {
+		name = "admin"
+		instance = "${google_sql_database_instance.instance.name}"
+		password = "%s"
+	}
+	`, instance, password)
 }
diff --git a/google/resource_storage_bucket_acl_test.go b/google/resource_storage_bucket_acl_test.go
index 3c268b2506c..6d3cfb04af4 100644
--- a/google/resource_storage_bucket_acl_test.go
+++ b/google/resource_storage_bucket_acl_test.go
@@ -208,12 +208,12 @@ func testAccStorageBucketAclDestroy(s *terraform.State) error {
 func testGoogleStorageBucketsAclBasic1(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s", "%s", "%s", "%s"]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, roleEntityOwners, roleEntityEditors, roleEntityViewers, roleEntityBasic1, roleEntityBasic2)
 }
@@ -221,12 +221,12 @@ resource "google_storage_bucket_acl" "acl" {
 func testGoogleStorageBucketsAclBasic2(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s", "%s", "%s", "%s"]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, roleEntityOwners, roleEntityEditors, roleEntityViewers, roleEntityBasic2, roleEntityBasic3_owner)
 }
@@ -234,12 +234,12 @@ resource "google_storage_bucket_acl" "acl" {
 func testGoogleStorageBucketsAclBasicDelete(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = []
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = []
 }
 `, bucketName)
 }
@@ -247,12 +247,12 @@ resource "google_storage_bucket_acl" "acl" {
 func testGoogleStorageBucketsAclBasic3(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s", "%s", "%s", "%s"]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, roleEntityOwners, roleEntityEditors, roleEntityViewers, roleEntityBasic2, roleEntityBasic3_reader)
 }
@@ -264,7 +264,7 @@ resource "google_storage_bucket" "bucket" {
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, roleEntityBasic1, roleEntityViewers, roleEntityOwners, roleEntityBasic2, roleEntityEditors)
@@ -273,13 +273,13 @@ resource "google_storage_bucket_acl" "acl" {
 func testGoogleStorageBucketsAclPredefined(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_acl" "acl" {
-  bucket         = google_storage_bucket.bucket.name
-  predefined_acl = "projectPrivate"
-  default_acl    = "projectPrivate"
+	bucket = "${google_storage_bucket.bucket.name}"
+	predefined_acl = "projectPrivate"
+	default_acl = "projectPrivate"
 }
 `, bucketName)
 }
diff --git a/google/resource_storage_bucket_iam_test.go b/google/resource_storage_bucket_iam_test.go
index 2148003a137..1888be7b872 100644
--- a/google/resource_storage_bucket_iam_test.go
+++ b/google/resource_storage_bucket_iam_test.go
@@ -138,95 +138,101 @@ func testAccCheckGoogleStorageBucketIam(bucket, role string, members []string) r
 func testAccStorageBucketIamPolicy_update(bucket, account, serviceAcct string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_service_account" "test-account-1" {
-  account_id   = "%s-1"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-1"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
 resource "google_service_account" "test-account-2" {
-  account_id   = "%s-2"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-2"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
+
 data "google_iam_policy" "foo-policy" {
-  binding {
-    role = "roles/storage.objectViewer"
-
-    members = [
-      "serviceAccount:${google_service_account.test-account-1.email}",
-      "serviceAccount:${google_service_account.test-account-2.email}",
-    ]
-  }
-
-  binding {
-    role = "roles/storage.admin"
-    members = [
-      "serviceAccount:%s",
-    ]
-  }
+	binding {
+		role = "roles/storage.objectViewer"
+
+		members = [
+			"serviceAccount:${google_service_account.test-account-1.email}",
+			"serviceAccount:${google_service_account.test-account-2.email}",
+		]
+	}
+
+	binding {
+		role = "roles/storage.admin"
+		members = [
+			"serviceAccount:%s",
+		]
+	}
 }
 
 resource "google_storage_bucket_iam_policy" "bucket-binding" {
-  bucket      = google_storage_bucket.bucket.name
-  policy_data = data.google_iam_policy.foo-policy.policy_data
+	bucket      = "${google_storage_bucket.bucket.name}"
+	policy_data = "${data.google_iam_policy.foo-policy.policy_data}"
 }
+
 `, bucket, account, account, serviceAcct)
 }
 
 func testAccStorageBucketIamPolicy_basic(bucket, account, serviceAcct string) string {
 	return fmt.Sprintf(`
+
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_service_account" "test-account-1" {
-  account_id   = "%s-1"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-1"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
+
 data "google_iam_policy" "foo-policy" {
-  binding {
-    role = "roles/storage.objectViewer"
-    members = [
-      "serviceAccount:${google_service_account.test-account-1.email}",
-    ]
-  }
-
-  binding {
-    role = "roles/storage.admin"
-    members = [
-      "serviceAccount:%s",
-    ]
-  }
+	binding {
+		role = "roles/storage.objectViewer"
+		members = [
+			"serviceAccount:${google_service_account.test-account-1.email}",
+		]
+	}
+
+	binding {
+		role = "roles/storage.admin"
+		members = [
+			"serviceAccount:%s",
+		]
+	}
 }
 
 resource "google_storage_bucket_iam_policy" "bucket-binding" {
-  bucket      = google_storage_bucket.bucket.name
-  policy_data = data.google_iam_policy.foo-policy.policy_data
+	bucket      = "${google_storage_bucket.bucket.name}"
+	policy_data = "${data.google_iam_policy.foo-policy.policy_data}"
 }
+
+
 `, bucket, account, serviceAcct)
 }
 
 func testAccStorageBucketIamBinding_basic(bucket, account, role string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_service_account" "test-account-1" {
-  account_id   = "%s-1"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-1"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
 resource "google_storage_bucket_iam_binding" "foo" {
-  bucket = google_storage_bucket.bucket.name
-  role   = "%s"
-  members = [
-    "serviceAccount:${google_service_account.test-account-1.email}",
-  ]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role = "%s"
+	members = [
+		"serviceAccount:${google_service_account.test-account-1.email}",
+	]
 }
 `, bucket, account, role)
 }
@@ -234,26 +240,26 @@ resource "google_storage_bucket_iam_binding" "foo" {
 func testAccStorageBucketIamBinding_update(bucket, account, role string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_service_account" "test-account-1" {
-  account_id   = "%s-1"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-1"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
 resource "google_service_account" "test-account-2" {
-  account_id   = "%s-2"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-2"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
 resource "google_storage_bucket_iam_binding" "foo" {
-  bucket = google_storage_bucket.bucket.name
-  role   = "%s"
-  members = [
-    "serviceAccount:${google_service_account.test-account-1.email}",
-    "serviceAccount:${google_service_account.test-account-2.email}",
-  ]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role = "%s"
+	members = [
+		"serviceAccount:${google_service_account.test-account-1.email}",
+		"serviceAccount:${google_service_account.test-account-2.email}",
+	]
 }
 `, bucket, account, account, role)
 }
@@ -261,18 +267,18 @@ resource "google_storage_bucket_iam_binding" "foo" {
 func testAccStorageBucketIamMember_basic(bucket, account, role string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_service_account" "test-account-1" {
-  account_id   = "%s-1"
-  display_name = "Storage Bucket Iam Testing Account"
+	account_id   = "%s-1"
+	display_name = "Storage Bucket Iam Testing Account"
 }
 
 resource "google_storage_bucket_iam_member" "foo" {
-  bucket = google_storage_bucket.bucket.name
-  role   = "%s"
-  member = "serviceAccount:${google_service_account.test-account-1.email}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role = "%s"
+	member = "serviceAccount:${google_service_account.test-account-1.email}"
 }
 `, bucket, account, role)
 }
diff --git a/google/resource_storage_bucket_object_test.go b/google/resource_storage_bucket_object_test.go
index 714002f3c2b..ce93132fcea 100644
--- a/google/resource_storage_bucket_object_test.go
+++ b/google/resource_storage_bucket_object_test.go
@@ -302,13 +302,13 @@ func testAccStorageObjectDestroy(s *terraform.State) error {
 func testGoogleStorageBucketsObjectContent(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name    = "%s"
-  bucket  = google_storage_bucket.bucket.name
-  content = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	content = "%s"
 }
 `, bucketName, objectName, content)
 }
@@ -316,13 +316,13 @@ resource "google_storage_bucket_object" "object" {
 func testGoogleStorageBucketsObjectDynamicContent(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name    = "%s"
-  bucket  = google_storage_bucket.bucket.name
-  content = google_storage_bucket.bucket.project
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	content = "${google_storage_bucket.bucket.project}"
 }
 `, bucketName, objectName)
 }
@@ -330,13 +330,13 @@ resource "google_storage_bucket_object" "object" {
 func testGoogleStorageBucketsObjectBasic(bucketName, sourceFilename string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 `, bucketName, objectName, sourceFilename)
 }
@@ -345,17 +345,17 @@ func testGoogleStorageBucketsObject_optionalContentFields(
 	bucketName, disposition, encoding, language, content_type string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name                = "%s"
-  bucket              = google_storage_bucket.bucket.name
-  content             = "%s"
-  content_disposition = "%s"
-  content_encoding    = "%s"
-  content_language    = "%s"
-  content_type        = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	content = "%s"
+	content_disposition = "%s"
+	content_encoding = "%s"
+	content_language = "%s"
+	content_type = "%s"
 }
 `, bucketName, objectName, content, disposition, encoding, language, content_type)
 }
@@ -363,14 +363,14 @@ resource "google_storage_bucket_object" "object" {
 func testGoogleStorageBucketsObject_cacheControl(bucketName, sourceFilename, cacheControl string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name          = "%s"
-  bucket        = google_storage_bucket.bucket.name
-  source        = "%s"
-  cache_control = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
+	cache_control = "%s"
 }
 `, bucketName, objectName, sourceFilename, cacheControl)
 }
@@ -378,14 +378,14 @@ resource "google_storage_bucket_object" "object" {
 func testGoogleStorageBucketsObject_storageClass(bucketName string, storageClass string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name          = "%s"
-  bucket        = google_storage_bucket.bucket.name
-  content       = "%s"
-  storage_class = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	content = "%s"
+	storage_class = "%s"
 }
 `, bucketName, objectName, content, storageClass)
 }
diff --git a/google/resource_storage_bucket_test.go b/google/resource_storage_bucket_test.go
index e6d8eb1e11d..56663df3776 100644
--- a/google/resource_storage_bucket_test.go
+++ b/google/resource_storage_bucket_test.go
@@ -1057,7 +1057,7 @@ func testAccStorageBucketDestroy(s *terraform.State) error {
 func testAccStorageBucket_basic(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 `, bucketName)
 }
@@ -1065,8 +1065,8 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_requesterPays(bucketName string, pays bool) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name           = "%s"
-  requester_pays = %t
+	name = "%s"
+	requester_pays = %t
 }
 `, bucketName, pays)
 }
@@ -1074,8 +1074,8 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lowercaseLocation(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name     = "%s"
-  location = "eu"
+	name = "%s"
+	location = "eu"
 }
 `, bucketName)
 }
@@ -1083,9 +1083,9 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_customAttributes(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  location      = "EU"
-  force_destroy = "true"
+	name = "%s"
+	location = "EU"
+	force_destroy = "true"
 }
 `, bucketName)
 }
@@ -1093,17 +1093,17 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_customAttributes_withLifecycle1(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  location      = "EU"
-  force_destroy = "true"
-  lifecycle_rule {
-    action {
-      type = "Delete"
-    }
-    condition {
-      age = 10
-    }
-  }
+	name = "%s"
+	location = "EU"
+	force_destroy = "true"
+	lifecycle_rule {
+		action {
+			type = "Delete"
+		}
+		condition {
+			age = 10
+		}
+	}
 }
 `, bucketName)
 }
@@ -1111,27 +1111,27 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_customAttributes_withLifecycle2(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  location      = "EU"
-  force_destroy = "true"
-  lifecycle_rule {
-    action {
-      type          = "SetStorageClass"
-      storage_class = "NEARLINE"
-    }
-    condition {
-      age = 2
-    }
-  }
-  lifecycle_rule {
-    action {
-      type = "Delete"
-    }
-    condition {
-      age                = 10
-      num_newer_versions = 2
-    }
-  }
+	name = "%s"
+	location = "EU"
+	force_destroy = "true"
+	lifecycle_rule {
+		action {
+			type = "SetStorageClass"
+			storage_class = "NEARLINE"
+		}
+		condition {
+			age = 2
+		}
+	}
+	lifecycle_rule {
+		action {
+			type = "Delete"
+		}
+		condition {
+			age = 10
+			num_newer_versions = 2
+		}
+	}
 }
 `, bucketName)
 }
@@ -1144,8 +1144,8 @@ func testAccStorageBucket_storageClass(bucketName, storageClass, location string
 	}
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  storage_class = "%s"%s
+	name = "%s"
+	storage_class = "%s"%s
 }
 `, bucketName, storageClass, locationBlock)
 }
@@ -1153,20 +1153,20 @@ resource "google_storage_bucket" "bucket" {
 func testGoogleStorageBucketsCors(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  cors {
-    origin          = ["abc", "def"]
-    method          = ["a1a"]
-    response_header = ["123", "456", "789"]
-    max_age_seconds = 10
-  }
+	name = "%s"
+	cors {
+	  origin = ["abc", "def"]
+	  method = ["a1a"]
+	  response_header = ["123", "456", "789"]
+	  max_age_seconds = 10
+	}
 
-  cors {
-    origin          = ["ghi", "jkl"]
-    method          = ["z9z"]
-    response_header = ["000"]
-    max_age_seconds = 5
-  }
+	cors {
+	  origin = ["ghi", "jkl"]
+	  method = ["z9z"]
+	  response_header = ["000"]
+	  max_age_seconds = 5
+	}
 }
 `, bucketName)
 }
@@ -1174,11 +1174,11 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_forceDestroyWithVersioning(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name          = "%s"
-  force_destroy = "true"
-  versioning {
-    enabled = "true"
-  }
+	name = "%s"
+	force_destroy = "true"
+	versioning {
+	  enabled = "true"
+	}
 }
 `, bucketName)
 }
@@ -1186,10 +1186,10 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_versioning(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  versioning {
-    enabled = "true"
-  }
+	name = "%s"
+	versioning {
+	  enabled = "true"
+	}
 }
 `, bucketName)
 }
@@ -1197,10 +1197,10 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_logging(bucketName string, logBucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  logging {
-    log_bucket = "%s"
-  }
+	name = "%s"
+	logging {
+		log_bucket = "%s"
+	}
 }
 `, bucketName, logBucketName)
 }
@@ -1208,11 +1208,11 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_loggingWithPrefix(bucketName string, logBucketName string, prefix string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  logging {
-    log_bucket        = "%s"
-    log_object_prefix = "%s"
-  }
+	name = "%s"
+	logging {
+		log_bucket = "%s"
+		log_object_prefix = "%s"
+	}
 }
 `, bucketName, logBucketName, prefix)
 }
@@ -1220,43 +1220,43 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lifecycleRulesMultiple(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  lifecycle_rule {
-    action {
-      type          = "SetStorageClass"
-      storage_class = "NEARLINE"
-    }
-    condition {
-      matches_storage_class = ["COLDLINE"]
-      age                   = 2
-    }
-  }
-  lifecycle_rule {
-    action {
-      type = "Delete"
-    }
-    condition {
-      age = 10
-    }
-  }
-  lifecycle_rule {
-    action {
-      type          = "SetStorageClass"
-      storage_class = "NEARLINE"
-    }
-    condition {
-      created_before = "2019-01-01"
-    }
-  }
-  lifecycle_rule {
-    action {
-      type          = "SetStorageClass"
-      storage_class = "NEARLINE"
-    }
-    condition {
-      num_newer_versions = 10
-    }
-  }
+	name = "%s"
+	lifecycle_rule {
+		action {
+			type = "SetStorageClass"
+			storage_class = "NEARLINE"
+		}
+		condition {
+			matches_storage_class = ["COLDLINE"]
+			age = 2
+		}
+  	}
+	lifecycle_rule {
+		action {
+			type = "Delete"
+		}
+		condition {
+			age = 10
+		}
+	}
+	lifecycle_rule {
+		action {
+			type = "SetStorageClass"
+			storage_class = "NEARLINE"
+		}
+		condition {
+			created_before = "2019-01-01"
+		}
+	}
+	lifecycle_rule {
+		action {
+			type = "SetStorageClass"
+			storage_class = "NEARLINE"
+		}
+		condition {
+			num_newer_versions = 10
+		}
+	}
 }
 `, bucketName)
 }
@@ -1264,7 +1264,7 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lifecycleRule_emptyArchived(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name          = "%s"
   lifecycle_rule {
     action {
       type = "Delete"
@@ -1281,14 +1281,14 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lifecycleRule_withStateArchived(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name          = "%s"
   lifecycle_rule {
     action {
       type = "Delete"
     }
 
     condition {
-      age        = 10
+      age = 10
       with_state = "ARCHIVED"
     }
   }
@@ -1299,14 +1299,14 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lifecycleRule_withStateLive(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name          = "%s"
   lifecycle_rule {
     action {
       type = "Delete"
     }
 
     condition {
-      age        = 10
+      age = 10
       with_state = "LIVE"
     }
   }
@@ -1317,14 +1317,14 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lifecycleRule_withStateAny(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+  name          = "%s"
   lifecycle_rule {
     action {
       type = "Delete"
     }
 
     condition {
-      age        = 10
+      age = 10
       with_state = "ANY"
     }
   }
@@ -1335,10 +1335,10 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_labels(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  labels = {
-    my-label = "my-label-value"
-  }
+	name = "%s"
+	labels = {
+		my-label = "my-label-value"
+	}
 }
 `, bucketName)
 }
@@ -1346,8 +1346,8 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_bucketPolicyOnly(bucketName string, enabled bool) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name               = "%s"
-  bucket_policy_only = %t
+	name = "%s"
+	bucket_policy_only = %t
 }
 `, bucketName, enabled)
 }
@@ -1355,46 +1355,46 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_encryption(context map[string]interface{}) string {
 	return Nprintf(`
 resource "google_project" "acceptance" {
-  name            = "terraform-%{random_suffix}"
-  project_id      = "terraform-%{random_suffix}"
-  org_id          = "%{organization}"
-  billing_account = "%{billing_account}"
+	name            = "terraform-%{random_suffix}"
+	project_id      = "terraform-%{random_suffix}"
+	org_id          = "%{organization}"
+	billing_account = "%{billing_account}"
 }
 
 resource "google_project_service" "acceptance" {
-  project = google_project.acceptance.project_id
-  service = "cloudkms.googleapis.com"
+	project = "${google_project.acceptance.project_id}"
+	service = "cloudkms.googleapis.com"
 }
 
 resource "google_kms_key_ring" "key_ring" {
-  name     = "tf-test-%{random_suffix}"
-  project  = google_project_service.acceptance.project
-  location = "us"
+	name     = "tf-test-%{random_suffix}"
+	project  = "${google_project_service.acceptance.project}"
+	location = "us"
 }
 
 resource "google_kms_crypto_key" "crypto_key" {
-  name            = "tf-test-%{random_suffix}"
-  key_ring        = google_kms_key_ring.key_ring.id
-  rotation_period = "1000000s"
+	name            = "tf-test-%{random_suffix}"
+	key_ring        = "${google_kms_key_ring.key_ring.id}"
+	rotation_period = "1000000s"
 }
 
 resource "google_storage_bucket" "bucket" {
-  name = "tf-test-crypto-bucket-%{random_int}"
-  encryption {
-    default_kms_key_name = google_kms_crypto_key.crypto_key.self_link
-  }
+	name = "tf-test-crypto-bucket-%{random_int}"
+	encryption {
+		default_kms_key_name = "${google_kms_crypto_key.crypto_key.self_link}"
+	}
 }
-`, context)
+	`, context)
 }
 
 func testAccStorageBucket_updateLabels(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
-  labels = {
-    my-label    = "my-updated-label-value"
-    a-new-label = "a-new-label-value"
-  }
+	name = "%s"
+	labels = {
+		my-label    = "my-updated-label-value"
+		a-new-label = "a-new-label-value"
+	}
 }
 `, bucketName)
 }
@@ -1402,26 +1402,26 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_website(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "website" {
-  name          = "%s.gcp.tfacc.hashicorptest.com"
-  location      = "US"
-  storage_class = "MULTI_REGIONAL"
+	name     = "%s.gcp.tfacc.hashicorptest.com"
+	location = "US"
+	storage_class = "MULTI_REGIONAL"
 
-  website {
-    main_page_suffix = "index.html"
-    not_found_page   = "404.html"
+	website {
+	  main_page_suffix = "index.html"
+	  not_found_page   = "404.html"
+	}
   }
-}
 `, bucketName)
 }
 
 func testAccStorageBucket_retentionPolicy(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+    name = "%s"
 
-  retention_policy {
-    retention_period = 10
-  }
+    retention_policy {
+      retention_period = 10
+    }
 }
 `, bucketName)
 }
@@ -1429,12 +1429,12 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_lockedRetentionPolicy(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+    name = "%s"
 
-  retention_policy {
-    is_locked        = true
-    retention_period = 10
-  }
+    retention_policy {
+      is_locked = true
+      retention_period = 10
+    }
 }
 `, bucketName)
 }
@@ -1442,26 +1442,25 @@ resource "google_storage_bucket" "bucket" {
 func testAccStorageBucket_websiteNoAttributes(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "website" {
-  name          = "%s.gcp.tfacc.hashicorptest.com"
-  location      = "US"
-  storage_class = "MULTI_REGIONAL"
+	name     = "%s.gcp.tfacc.hashicorptest.com"
+	location = "US"
+	storage_class = "MULTI_REGIONAL"
 
-  website {
+	website {}
   }
-}
 `, bucketName)
 }
 
 func testAccStorageBucket_websiteOneAttribute(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "website" {
-  name          = "%s.gcp.tfacc.hashicorptest.com"
-  location      = "US"
-  storage_class = "MULTI_REGIONAL"
+	name     = "%s.gcp.tfacc.hashicorptest.com"
+	location = "US"
+	storage_class = "MULTI_REGIONAL"
 
-  website {
-    main_page_suffix = "index.html"
+	website {
+	  main_page_suffix = "index.html"
+	}
   }
-}
 `, bucketName)
 }
diff --git a/google/resource_storage_default_object_access_control_test.go b/google/resource_storage_default_object_access_control_test.go
index 71426b69cfd..2d4f871f1ab 100644
--- a/google/resource_storage_default_object_access_control_test.go
+++ b/google/resource_storage_default_object_access_control_test.go
@@ -44,13 +44,13 @@ func TestAccStorageDefaultObjectAccessControl_update(t *testing.T) {
 func testGoogleStorageDefaultObjectAccessControlBasic(bucketName, role, entity string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_default_object_access_control" "default" {
-  bucket = google_storage_bucket.bucket.name
-  role   = "%s"
-  entity = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role   = "%s"
+	entity = "%s"
 }
 `, bucketName, role, entity)
 }
diff --git a/google/resource_storage_default_object_acl_test.go b/google/resource_storage_default_object_acl_test.go
index ac05160f1bf..a100b0556c2 100644
--- a/google/resource_storage_default_object_acl_test.go
+++ b/google/resource_storage_default_object_acl_test.go
@@ -196,12 +196,12 @@ func testAccCheckGoogleStorageDefaultObjectAclDelete(bucket, roleEntityS string)
 func testGoogleStorageDefaultObjectsAclBasic(bucketName, roleEntity1, roleEntity2 string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_default_object_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s"]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s"]
 }
 `, bucketName, roleEntity1, roleEntity2)
 }
@@ -209,12 +209,12 @@ resource "google_storage_default_object_acl" "acl" {
 func testGoogleStorageDefaultObjectsAclBasicDelete(bucketName, roleEntity string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_default_object_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s"]
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s"]
 }
 `, bucketName, roleEntity)
 }
@@ -222,12 +222,12 @@ resource "google_storage_default_object_acl" "acl" {
 func testGoogleStorageDefaultObjectsAclNoRoleEntity(bucketName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_default_object_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = []
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = []
 }
 `, bucketName)
 }
@@ -239,7 +239,7 @@ resource "google_storage_bucket" "bucket" {
 }
 
 resource "google_storage_default_object_acl" "acl" {
-  bucket      = google_storage_bucket.bucket.name
+  bucket = "${google_storage_bucket.bucket.name}"
   role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, roleEntityBasic1, roleEntityViewers, roleEntityOwners, roleEntityBasic2, roleEntityEditors)
diff --git a/google/resource_storage_notification_test.go b/google/resource_storage_notification_test.go
index 0abb075ba69..4266d3847df 100644
--- a/google/resource_storage_notification_test.go
+++ b/google/resource_storage_notification_test.go
@@ -178,75 +178,75 @@ func testAccCheckStorageNotificationCheckAttributes(notification *storage.Notifi
 func testGoogleStorageNotificationBasic(bucketName, topicName, topic string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
-
+		
 resource "google_pubsub_topic" "topic" {
-  name = "%s"
+	name = "%s"
 }
 
 // We have to provide GCS default storage account with the permission
 // to publish to a Cloud Pub/Sub topic from this project
 // Otherwise notification configuration won't work
-data "google_storage_project_service_account" "gcs_account" {
-}
+data "google_storage_project_service_account" "gcs_account" {}
 
 resource "google_pubsub_topic_iam_binding" "binding" {
-  topic = google_pubsub_topic.topic.name
-  role  = "roles/pubsub.publisher"
-
-  members = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
+	topic   = "${google_pubsub_topic.topic.name}"
+	role    = "roles/pubsub.publisher"
+		  
+	members = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
 }
 
 resource "google_storage_notification" "notification" {
-  bucket         = google_storage_bucket.bucket.name
-  payload_format = "JSON_API_V1"
-  topic          = google_pubsub_topic.topic.id
-  depends_on     = [google_pubsub_topic_iam_binding.binding]
+	bucket         = "${google_storage_bucket.bucket.name}"
+	payload_format = "JSON_API_V1"
+	topic          = "${google_pubsub_topic.topic.id}"
+	depends_on     = ["google_pubsub_topic_iam_binding.binding"]
 }
 
 resource "google_storage_notification" "notification_with_prefix" {
-  bucket             = google_storage_bucket.bucket.name
-  payload_format     = "JSON_API_V1"
-  topic              = google_pubsub_topic.topic.id
-  object_name_prefix = "foobar"
-  depends_on         = [google_pubsub_topic_iam_binding.binding]
+	bucket             = "${google_storage_bucket.bucket.name}"
+	payload_format     = "JSON_API_V1"
+	topic              = "${google_pubsub_topic.topic.id}"
+	object_name_prefix = "foobar"
+	depends_on         = ["google_pubsub_topic_iam_binding.binding"]
 }
+
 `, bucketName, topicName)
 }
 
 func testGoogleStorageNotificationOptionalEventsAttributes(bucketName, topicName, topic, eventType1, eventType2 string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
-
+		
 resource "google_pubsub_topic" "topic" {
-  name = "%s"
+	name = "%s"
 }
 
 // We have to provide GCS default storage account with the permission
 // to publish to a Cloud Pub/Sub topic from this project
 // Otherwise notification configuration won't work
-data "google_storage_project_service_account" "gcs_account" {
-}
+data "google_storage_project_service_account" "gcs_account" {}
 
 resource "google_pubsub_topic_iam_binding" "binding" {
-  topic = google_pubsub_topic.topic.name
-  role  = "roles/pubsub.publisher"
-
-  members = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
+	topic       = "${google_pubsub_topic.topic.name}"
+	role        = "roles/pubsub.publisher"
+		  
+	members     = ["serviceAccount:${data.google_storage_project_service_account.gcs_account.email_address}"]
 }
 
 resource "google_storage_notification" "notification" {
-  bucket         = google_storage_bucket.bucket.name
-  payload_format = "JSON_API_V1"
-  topic          = google_pubsub_topic.topic.id
-  event_types    = ["%s", "%s"]
-  custom_attributes = {
-    new-attribute = "new-attribute-value"
-  }
-  depends_on = [google_pubsub_topic_iam_binding.binding]
+	bucket            = "${google_storage_bucket.bucket.name}"
+	payload_format    = "JSON_API_V1"
+	topic             = "${google_pubsub_topic.topic.id}"
+	event_types       = ["%s","%s"]
+	custom_attributes = {
+		new-attribute = "new-attribute-value"
+	}
+	depends_on        = ["google_pubsub_topic_iam_binding.binding"]
 }
+
 `, bucketName, topicName, eventType1, eventType2)
 }
diff --git a/google/resource_storage_object_access_control_test.go b/google/resource_storage_object_access_control_test.go
index 017d42a67b8..23b45669c34 100644
--- a/google/resource_storage_object_access_control_test.go
+++ b/google/resource_storage_object_access_control_test.go
@@ -50,20 +50,20 @@ func TestAccStorageObjectAccessControl_update(t *testing.T) {
 func testGoogleStorageObjectAccessControlBasic(bucketName, objectName, role, entity string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_access_control" "default" {
-  object = google_storage_bucket_object.object.name
-  bucket = google_storage_bucket.bucket.name
-  role   = "%s"
-  entity = "%s"
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role   = "%s"
+	entity = "%s"
 }
 `, bucketName, objectName, tfObjectAcl.Name(), role, entity)
 }
diff --git a/google/resource_storage_object_acl_test.go b/google/resource_storage_object_acl_test.go
index 968d1ff5bfc..ec19b2d99d7 100644
--- a/google/resource_storage_object_acl_test.go
+++ b/google/resource_storage_object_acl_test.go
@@ -341,19 +341,19 @@ func testAccStorageObjectAclDestroy(s *terraform.State) error {
 func testGoogleStorageObjectsAclBasicDelete(bucketName string, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object      = google_storage_bucket_object.object.name
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = []
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = []
 }
 `, bucketName, objectName, tfObjectAcl.Name())
 }
@@ -361,19 +361,19 @@ resource "google_storage_object_acl" "acl" {
 func testGoogleStorageObjectsAclBasic1(bucketName string, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object      = google_storage_bucket_object.object.name
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s"]
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s"]
 }
 `, bucketName, objectName, tfObjectAcl.Name(),
 		roleEntityBasic1, roleEntityBasic2)
@@ -382,19 +382,19 @@ resource "google_storage_object_acl" "acl" {
 func testGoogleStorageObjectsAclBasic2(bucketName string, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object      = google_storage_bucket_object.object.name
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s"]
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s"]
 }
 `, bucketName, objectName, tfObjectAcl.Name(),
 		roleEntityBasic2, roleEntityBasic3_owner)
@@ -403,19 +403,19 @@ resource "google_storage_object_acl" "acl" {
 func testGoogleStorageObjectsAclBasic3(bucketName string, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object      = google_storage_bucket_object.object.name
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s"]
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s"]
 }
 `, bucketName, objectName, tfObjectAcl.Name(),
 		roleEntityBasic2, roleEntityBasic3_reader)
@@ -424,19 +424,19 @@ resource "google_storage_object_acl" "acl" {
 func testGoogleStorageObjectsAclPredefined(bucketName string, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object         = google_storage_bucket_object.object.name
-  bucket         = google_storage_bucket.bucket.name
-  predefined_acl = "projectPrivate"
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	predefined_acl = "projectPrivate"
 }
 `, bucketName, objectName, tfObjectAcl.Name())
 }
@@ -444,19 +444,19 @@ resource "google_storage_object_acl" "acl" {
 func testGoogleStorageObjectAclUnordered(bucketName, objectName string) string {
 	return fmt.Sprintf(`
 resource "google_storage_bucket" "bucket" {
-  name = "%s"
+	name = "%s"
 }
 
 resource "google_storage_bucket_object" "object" {
-  name   = "%s"
-  bucket = google_storage_bucket.bucket.name
-  source = "%s"
+	name = "%s"
+	bucket = "${google_storage_bucket.bucket.name}"
+	source = "%s"
 }
 
 resource "google_storage_object_acl" "acl" {
-  object      = google_storage_bucket_object.object.name
-  bucket      = google_storage_bucket.bucket.name
-  role_entity = ["%s", "%s", "%s", "%s", "%s"]
+	object = "${google_storage_bucket_object.object.name}"
+	bucket = "${google_storage_bucket.bucket.name}"
+	role_entity = ["%s", "%s", "%s", "%s", "%s"]
 }
 `, bucketName, objectName, tfObjectAcl.Name(), roleEntityBasic1, roleEntityViewers, roleEntityOwners, roleEntityBasic2, roleEntityEditors)
 }
diff --git a/google/resource_storage_transfer_job_test.go b/google/resource_storage_transfer_job_test.go
index e057a489860..36586686da6 100644
--- a/google/resource_storage_transfer_job_test.go
+++ b/google/resource_storage_transfer_job_test.go
@@ -118,7 +118,7 @@ func testAccStorageTransferJobDestroy(s *terraform.State) error {
 func testAccStorageTransferJob_basic(project string, dataSourceBucketName string, dataSinkBucketName string, transferJobDescription string) string {
 	return fmt.Sprintf(`
 data "google_storage_transfer_project_service_account" "default" {
-  project = "%s"
+  project       = "%s"
 }
 
 resource "google_storage_bucket" "data_source" {
@@ -128,9 +128,9 @@ resource "google_storage_bucket" "data_source" {
 }
 
 resource "google_storage_bucket_iam_member" "data_source" {
-  bucket = google_storage_bucket.data_source.name
-  role   = "roles/storage.admin"
-  member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
+  bucket        = "${google_storage_bucket.data_source.name}"
+  role          = "roles/storage.admin"
+  member        = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
 resource "google_storage_bucket" "data_sink" {
@@ -140,47 +140,47 @@ resource "google_storage_bucket" "data_sink" {
 }
 
 resource "google_storage_bucket_iam_member" "data_sink" {
-  bucket = google_storage_bucket.data_sink.name
-  role   = "roles/storage.admin"
-  member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
+  bucket        = "${google_storage_bucket.data_sink.name}"
+  role          = "roles/storage.admin"
+  member        = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
 resource "google_storage_transfer_job" "transfer_job" {
-  description = "%s"
-  project     = "%s"
-
-  transfer_spec {
-    gcs_data_source {
-      bucket_name = google_storage_bucket.data_source.name
-    }
-    gcs_data_sink {
-      bucket_name = google_storage_bucket.data_sink.name
-    }
-  }
-
-  schedule {
-    schedule_start_date {
-      year  = 2018
-      month = 10
-      day   = 1
-    }
-    schedule_end_date {
-      year  = 2019
-      month = 10
-      day   = 1
-    }
-    start_time_of_day {
-      hours   = 0
-      minutes = 30
-      seconds = 0
-      nanos   = 0
-    }
-  }
-
-  depends_on = [
-    google_storage_bucket_iam_member.data_source,
-    google_storage_bucket_iam_member.data_sink,
-  ]
+	description	= "%s"
+	project     = "%s"
+
+	transfer_spec {
+		gcs_data_source {
+			bucket_name = "${google_storage_bucket.data_source.name}"
+		}
+		gcs_data_sink {
+			bucket_name = "${google_storage_bucket.data_sink.name}"
+		}
+	}
+
+	schedule {
+		schedule_start_date {
+			year	= 2018
+			month	= 10
+			day		= 1
+		}
+		schedule_end_date {
+			year	= 2019
+			month	= 10
+			day		= 1
+		}
+		start_time_of_day {
+			hours	= 0
+			minutes	= 30
+			seconds	= 0
+			nanos	= 0
+		}
+	}
+
+	depends_on = [
+		"google_storage_bucket_iam_member.data_source",
+		"google_storage_bucket_iam_member.data_sink",
+	]
 }
 `, project, dataSourceBucketName, project, dataSinkBucketName, project, transferJobDescription, project)
 }
@@ -188,7 +188,7 @@ resource "google_storage_transfer_job" "transfer_job" {
 func testAccStorageTransferJob_omitScheduleEndDate(project string, dataSourceBucketName string, dataSinkBucketName string, transferJobDescription string) string {
 	return fmt.Sprintf(`
 data "google_storage_transfer_project_service_account" "default" {
-  project = "%s"
+  project       = "%s"
 }
 
 resource "google_storage_bucket" "data_source" {
@@ -198,9 +198,9 @@ resource "google_storage_bucket" "data_source" {
 }
 
 resource "google_storage_bucket_iam_member" "data_source" {
-  bucket = google_storage_bucket.data_source.name
-  role   = "roles/storage.admin"
-  member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
+  bucket        = "${google_storage_bucket.data_source.name}"
+  role          = "roles/storage.admin"
+  member        = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
 resource "google_storage_bucket" "data_sink" {
@@ -210,42 +210,42 @@ resource "google_storage_bucket" "data_sink" {
 }
 
 resource "google_storage_bucket_iam_member" "data_sink" {
-  bucket = google_storage_bucket.data_sink.name
-  role   = "roles/storage.admin"
-  member = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
+  bucket        = "${google_storage_bucket.data_sink.name}"
+  role          = "roles/storage.admin"
+  member        = "serviceAccount:${data.google_storage_transfer_project_service_account.default.email}"
 }
 
 resource "google_storage_transfer_job" "transfer_job" {
-  description = "%s"
-  project     = "%s"
-
-  transfer_spec {
-    gcs_data_source {
-      bucket_name = google_storage_bucket.data_source.name
-    }
-    gcs_data_sink {
-      bucket_name = google_storage_bucket.data_sink.name
-    }
-  }
-
-  schedule {
-    schedule_start_date {
-      year  = 2018
-      month = 10
-      day   = 1
-    }
-    start_time_of_day {
-      hours   = 0
-      minutes = 30
-      seconds = 0
-      nanos   = 0
-    }
-  }
-
-  depends_on = [
-    google_storage_bucket_iam_member.data_source,
-    google_storage_bucket_iam_member.data_sink,
-  ]
+	description	= "%s"
+	project     = "%s"
+
+	transfer_spec {
+		gcs_data_source {
+			bucket_name = "${google_storage_bucket.data_source.name}"
+		}
+		gcs_data_sink {
+			bucket_name = "${google_storage_bucket.data_sink.name}"
+		}
+	}
+
+	schedule {
+		schedule_start_date {
+			year	= 2018
+			month	= 10
+			day		= 1
+		}
+		start_time_of_day {
+			hours	= 0
+			minutes	= 30
+			seconds	= 0
+			nanos	= 0
+		}
+	}
+
+	depends_on = [
+		"google_storage_bucket_iam_member.data_source",
+		"google_storage_bucket_iam_member.data_sink",
+	]
 }
 `, project, dataSourceBucketName, project, dataSinkBucketName, project, transferJobDescription, project)
 }
diff --git a/google/resource_tpu_node_test.go b/google/resource_tpu_node_test.go
index 5c13da1e5ed..9fcaf4a92dc 100644
--- a/google/resource_tpu_node_test.go
+++ b/google/resource_tpu_node_test.go
@@ -45,15 +45,14 @@ func TestAccTPUNode_tpuNodeBUpdateTensorFlowVersion(t *testing.T) {
 // autogenerated examples.
 func testAccTpuNode_tpuNodeTensorFlow(nodeId string, versionIdx int) string {
 	return fmt.Sprintf(`
-data "google_tpu_tensorflow_versions" "available" {
-}
+data "google_tpu_tensorflow_versions" "available" { }
 
 resource "google_tpu_node" "tpu" {
-  name = "%s"
-  zone = "us-central1-b"
+  name           = "%s"
+  zone           = "us-central1-b"
 
   accelerator_type   = "v3-8"
-  tensorflow_version = data.google_tpu_tensorflow_versions.available.versions[%d]
+  tensorflow_version = "${data.google_tpu_tensorflow_versions.available.versions[%d]}"
   cidr_block         = "10.1.0.0/29"
 }
 `, nodeId, versionIdx)
diff --git a/google/resource_usage_export_bucket_test.go b/google/resource_usage_export_bucket_test.go
index 9de321e791b..3971643296e 100644
--- a/google/resource_usage_export_bucket_test.go
+++ b/google/resource_usage_export_bucket_test.go
@@ -34,26 +34,26 @@ func TestAccComputeResourceUsageExportBucket(t *testing.T) {
 func testAccResourceUsageExportBucket(baseProject, org, billingId string) string {
 	return fmt.Sprintf(`
 resource "google_project" "base" {
-  project_id      = "%s"
-  name            = "Export Bucket Base"
-  org_id          = "%s"
-  billing_account = "%s"
+	project_id      = "%s"
+	name            = "Export Bucket Base"
+	org_id          = "%s"
+	billing_account = "%s"
 }
 
 resource "google_project_service" "service" {
-  project = google_project.base.project_id
-  service = "compute.googleapis.com"
+	project = "${google_project.base.project_id}"
+	service = "compute.googleapis.com"
 }
 
 resource "google_storage_bucket" "bucket" {
-  name    = "b-${google_project.base.project_id}"
-  project = google_project_service.service.project
+  name = "b-${google_project.base.project_id}"
+	project = "${google_project_service.service.project}"
 }
 
 resource "google_project_usage_export_bucket" "ueb" {
-  project     = google_project.base.project_id
-  bucket_name = google_storage_bucket.bucket.name
-  prefix      = "foobar"
+  project = "${google_project.base.project_id}"
+  bucket_name = "${google_storage_bucket.bucket.name}"
+	prefix = "foobar"
 }
 `, baseProject, org, billingId)
 }