diff --git a/examples/okta_auth_server/dependency.tf b/examples/okta_auth_server/dependency.tf
index 3d0db161..37150cb3 100644
--- a/examples/okta_auth_server/dependency.tf
+++ b/examples/okta_auth_server/dependency.tf
@@ -1,6 +1,6 @@
 resource okta_auth_server test {
-  name                      = "testAcc_replace_with_uuid"
-  audiences                 = ["api://selfservice_client_1"]
+  name      = "testAcc_replace_with_uuid"
+  audiences = ["api://selfservice_client_1"]
 }
 
 resource okta_auth_server test1 {
diff --git a/examples/okta_auth_server/full_stack_with_client.tf b/examples/okta_auth_server/full_stack_with_client.tf
index 0edc113c..0076f079 100644
--- a/examples/okta_auth_server/full_stack_with_client.tf
+++ b/examples/okta_auth_server/full_stack_with_client.tf
@@ -45,7 +45,7 @@ resource "okta_auth_server_policy_rule" "test" {
 
 resource "okta_app_oauth" "test" {
   status         = "ACTIVE"
-  label          = "test"
+  label          = "testAcc_replace_with_uuid"
   type           = "web"
   grant_types    = ["implicit", "authorization_code"]
   redirect_uris  = ["https://localhost:8443/redirect_uri/"]
diff --git a/okta/app_test.go b/okta/app_test.go
index 55fa0dd1..d9cbf9af 100644
--- a/okta/app_test.go
+++ b/okta/app_test.go
@@ -24,9 +24,9 @@ func deleteTestApps(client *testClient) error {
 			warnings = append(warnings, warn)
 		}
 
-		_, err = client.oktaClient.Application.DeleteApplication(app.ID)
+		resp, err := client.oktaClient.Application.DeleteApplication(app.ID)
 
-		if err != nil {
+		if err != nil && is404(resp.StatusCode) {
 			warnings = append(warnings, warn)
 		}
 	}
diff --git a/okta/resource_okta_app_user_test.go b/okta/resource_okta_app_user_test.go
index ae3210c0..80aee4c1 100644
--- a/okta/resource_okta_app_user_test.go
+++ b/okta/resource_okta_app_user_test.go
@@ -52,9 +52,8 @@ func TestAccOktaAppUser_crud(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName: resourceName,
+				ImportState:  true,
 				ImportStateIdFunc: func(s *terraform.State) (string, error) {
 					rs, ok := s.RootModule().Resources[resourceName]
 					if !ok {