diff --git a/es/provider_test.go b/es/provider_test.go
index 70e7afde..4b8f5c8c 100644
--- a/es/provider_test.go
+++ b/es/provider_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/sirupsen/logrus"
-	prefixed "github.com/x-cray/logrus-prefixed-formatter"
+	easy "github.com/t-tomalak/logrus-easy-formatter"
 )
 
 var testAccProviders map[string]*schema.Provider
@@ -15,8 +15,10 @@ var testAccProvider *schema.Provider
 func init() {
 
 	// Init logger
-	logrus.SetFormatter(new(prefixed.TextFormatter))
-	logrus.SetLevel(logrus.DebugLevel)
+	logrus.SetFormatter(&easy.Formatter{
+		LogFormat: "[%lvl%] %msg%\n",
+	})
+	//logrus.SetLevel(logrus.DebugLevel)
 
 	// Init provider
 	testAccProvider = Provider()
diff --git a/es/resource_elasticsearch_index_lifecycle_policy_test.go b/es/resource_elasticsearch_index_lifecycle_policy_test.go
index ac38efb8..095ddb4e 100644
--- a/es/resource_elasticsearch_index_lifecycle_policy_test.go
+++ b/es/resource_elasticsearch_index_lifecycle_policy_test.go
@@ -33,10 +33,9 @@ func TestAccElasticsearchIndexLifecyclePolicy(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "elasticsearch_index_lifecycle_policy.test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"policy"},
+				ResourceName:      "elasticsearch_index_lifecycle_policy.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
diff --git a/es/resource_elasticsearch_security_role_mapping_test.go b/es/resource_elasticsearch_security_role_mapping_test.go
index e21dd988..349feca7 100644
--- a/es/resource_elasticsearch_security_role_mapping_test.go
+++ b/es/resource_elasticsearch_security_role_mapping_test.go
@@ -33,10 +33,9 @@ func TestAccElasticsearchSecurityRoleMapping(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "elasticsearch_role_mapping.test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"metadata", "rules"},
+				ResourceName:      "elasticsearch_role_mapping.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
diff --git a/es/resource_elasticsearch_security_role_test.go b/es/resource_elasticsearch_security_role_test.go
index bc2961e4..793c403b 100644
--- a/es/resource_elasticsearch_security_role_test.go
+++ b/es/resource_elasticsearch_security_role_test.go
@@ -33,10 +33,9 @@ func TestAccElasticsearchSecurityRole(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "elasticsearch_role.test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"indices", "metadata"},
+				ResourceName:      "elasticsearch_role.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
diff --git a/es/resource_elasticsearch_security_user_test.go b/es/resource_elasticsearch_security_user_test.go
index 01b724bf..34eaf128 100644
--- a/es/resource_elasticsearch_security_user_test.go
+++ b/es/resource_elasticsearch_security_user_test.go
@@ -36,7 +36,7 @@ func TestAccElasticsearchSecurityUser(t *testing.T) {
 				ResourceName:            "elasticsearch_user.test",
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"metadata", "password", "password_hash"},
+				ImportStateVerifyIgnore: []string{"password", "password_hash"},
 			},
 		},
 	})
diff --git a/es/resource_elasticsearch_snapshot_lifecycle_policy_test.go b/es/resource_elasticsearch_snapshot_lifecycle_policy_test.go
index b3595133..8af0d6f2 100644
--- a/es/resource_elasticsearch_snapshot_lifecycle_policy_test.go
+++ b/es/resource_elasticsearch_snapshot_lifecycle_policy_test.go
@@ -36,10 +36,9 @@ func TestAccElasticsearchSnapshotLifecyclePolicy(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "elasticsearch_snapshot_lifecycle_policy.test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"configs", "retention"},
+				ResourceName:      "elasticsearch_snapshot_lifecycle_policy.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})
diff --git a/es/resource_elasticsearch_watcher_test.go b/es/resource_elasticsearch_watcher_test.go
index 2e53d7f8..aec2fa4c 100644
--- a/es/resource_elasticsearch_watcher_test.go
+++ b/es/resource_elasticsearch_watcher_test.go
@@ -33,10 +33,9 @@ func TestAccElasticsearchWatcher(t *testing.T) {
 				),
 			},
 			{
-				ResourceName:            "elasticsearch_watcher.test",
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"trigger", "input", "condition", "actions", "metadata"},
+				ResourceName:      "elasticsearch_watcher.test",
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 		},
 	})