diff --git a/internal/provider/waypoint/resource_waypoint_add_on_definition_test.go b/internal/provider/waypoint/resource_waypoint_add_on_definition_test.go
index 3721f14d1..2441663ff 100644
--- a/internal/provider/waypoint/resource_waypoint_add_on_definition_test.go
+++ b/internal/provider/waypoint/resource_waypoint_add_on_definition_test.go
@@ -142,14 +142,15 @@ resource "hcp_waypoint_add_on_definition" "test" {
   name    = %q
   summary = "some summary for fun"
   description = "some description for fun"
-  terraform_no_code_module = "private/waypoint-tfc-testing/waypoint-template-starter/null"
+  terraform_no_code_module_source = "private/waypoint-tfc-testing/waypoint-template-starter/null"
+  terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   terraform_cloud_workspace_details = {
     name                 = "Default Project"
     terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   }
   variable_options = [
-	{
-	  name        = "string_variable"
+  {
+    name        = "string_variable"
       variable_type = "string"
       options = [
         "b"
diff --git a/internal/provider/waypoint/resource_waypoint_add_on_test.go b/internal/provider/waypoint/resource_waypoint_add_on_test.go
index 27d9c8936..6b4737fb6 100644
--- a/internal/provider/waypoint/resource_waypoint_add_on_test.go
+++ b/internal/provider/waypoint/resource_waypoint_add_on_test.go
@@ -329,7 +329,7 @@ resource "hcp_waypoint_add_on_definition" "test_var_opts" {
   summary     = "some summary for fun"
   description = "some description"
   readme_markdown_template = base64encode("# Some Readme")
-  terraform_no_code_module = "private/waypoint-tfc-testing/waypoint-vault-dweller/null"
+  terraform_no_code_module_source = "private/waypoint-tfc-testing/waypoint-vault-dweller/null"
   terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   terraform_cloud_workspace_details = {
     name                 = "Default Project"
diff --git a/internal/provider/waypoint/resource_waypoint_application_test.go b/internal/provider/waypoint/resource_waypoint_application_test.go
index 67f88f4d1..d4c1e8760 100644
--- a/internal/provider/waypoint/resource_waypoint_application_test.go
+++ b/internal/provider/waypoint/resource_waypoint_application_test.go
@@ -192,10 +192,8 @@ resource "hcp_waypoint_template" "test" {
   name    = "%s"
   summary = "some summary for fun"
   readme_markdown_template = base64encode("# Some Readme")
-  terraform_no_code_module = {
-    source  = "private/waypoint-tfc-testing/waypoint-template-starter/null"
-    version = "0.0.2"
-  }
+  terraform_no_code_module_source = "private/waypoint-tfc-testing/waypoint-template-starter/null"
+  terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   terraform_cloud_workspace_details = {
     name                 = "Default Project"
     terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
@@ -216,6 +214,7 @@ resource "hcp_waypoint_template" "test_var_opts" {
   summary = "some summary for fun"
   readme_markdown_template = base64encode("# Some Readme")
   terraform_no_code_module_source = "private/waypoint-tfc-testing/waypoint-vault-dweller/null"
+  terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   terraform_cloud_workspace_details = {
     name                 = "Default Project"
     terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
@@ -274,25 +273,26 @@ resource "hcp_waypoint_template" "test_var_opts" {
   summary = "some summary for fun"
   readme_markdown_template = base64encode("# Some Readme")
   terraform_no_code_module_source = "private/waypoint-tfc-testing/waypoint-vault-dweller/null"
+  terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   terraform_cloud_workspace_details = {
     name                 = "Default Project"
     terraform_project_id = "prj-gfVyPJ2q2Aurn25o"
   }
   labels = ["fallout", "vault-tec"]
   variable_options = [
-	{
-	  name          = "vault_dweller_name"
+  {
+      name          = "vault_dweller_name"
       variable_type = "string"
       user_editable = false
-      options 		= [
+      options       = [
         "lone-wanderer",
       ]
     },
     {
-	  name          = "faction"
+      name          = "faction"
       variable_type = "string"
       user_editable = false
-      options 		= [
+      options       = [
         "brotherhood-of-steel",
       ]
     },