diff --git a/pkg/acceptance/bettertestspoc/config/config.go b/pkg/acceptance/bettertestspoc/config/config.go
index 3174d20fca..9a7a900bda 100644
--- a/pkg/acceptance/bettertestspoc/config/config.go
+++ b/pkg/acceptance/bettertestspoc/config/config.go
@@ -1,8 +1,6 @@
 package config
 
 import (
-	"encoding/json"
-	"fmt"
 	"reflect"
 	"strings"
 	"testing"
@@ -67,7 +65,8 @@ func ProviderFromModel(t *testing.T, model ProviderModel) string {
 	return hcl
 }
 
-// FromModels allows to combine multiple models.
+// FromModels should be used in terraform acceptance tests for Config attribute to get string config from all models.
+// FromModels allows to combine multiple model types.
 // TODO [SNOW-1501905]: introduce some common interface for all three existing models (ResourceModel, DatasourceModel, and ProviderModel)
 func FromModels(t *testing.T, models ...any) string {
 	t.Helper()
@@ -91,50 +90,6 @@ func FromModels(t *testing.T, models ...any) string {
 	return sb.String()
 }
 
-// FromModel should be used in terraform acceptance tests for Config attribute to get string config from ResourceModel.
-// Current implementation is really straightforward but it could be improved and tested. It may not handle all cases (like objects, lists, sets) correctly.
-// TODO [SNOW-1501905]: use reflection to build config directly from model struct (or some other different way)
-// TODO [SNOW-1501905]: add support for config.TestStepConfigFunc (to use as ConfigFile); the naive implementation would be to just create a tmp directory and save file there
-// TODO [SNOW-1501905]: add generating MarshalJSON() function
-// TODO [SNOW-1501905]: migrate resources to new config generation method (above needed first)
-// Use ResourceFromModel, DatasourceFromModel, ProviderFromModel, and FromModels instead.
-func FromModel(t *testing.T, model ResourceModel) string {
-	t.Helper()
-
-	b, err := json.Marshal(model)
-	require.NoError(t, err)
-
-	var objMap map[string]json.RawMessage
-	err = json.Unmarshal(b, &objMap)
-	require.NoError(t, err)
-
-	var sb strings.Builder
-	sb.WriteString(fmt.Sprintf(`resource "%s" "%s" {`, model.Resource(), model.ResourceName()))
-	sb.WriteRune('\n')
-	for k, v := range objMap {
-		sb.WriteString(fmt.Sprintf("\t%s = %s\n", k, v))
-	}
-	if len(model.DependsOn()) > 0 {
-		sb.WriteString(fmt.Sprintf("\tdepends_on = [%s]\n", strings.Join(model.DependsOn(), ", ")))
-	}
-	sb.WriteString(`}`)
-	sb.WriteRune('\n')
-	s := sb.String()
-	t.Logf("Generated config:\n%s", s)
-	return s
-}
-
-// FromModelsDeprecated allows to combine multiple resource models.
-// Use FromModels instead.
-func FromModelsDeprecated(t *testing.T, models ...ResourceModel) string {
-	t.Helper()
-	var sb strings.Builder
-	for _, model := range models {
-		sb.WriteString(FromModel(t, model) + "\n")
-	}
-	return sb.String()
-}
-
 // ConfigVariablesFromModel constructs config.Variables needed in acceptance tests that are using ConfigVariables in
 // combination with ConfigDirectory. It's necessary for cases not supported by FromModel, like lists of objects.
 // Use ResourceFromModel, DatasourceFromModel, ProviderFromModel, and FromModels instead.
diff --git a/pkg/acceptance/bettertestspoc/config/config_test.go b/pkg/acceptance/bettertestspoc/config/config_test.go
index f061058adc..5c6959012d 100644
--- a/pkg/acceptance/bettertestspoc/config/config_test.go
+++ b/pkg/acceptance/bettertestspoc/config/config_test.go
@@ -35,6 +35,9 @@ resource "snowflake_share" "test" {
 				Item{IntField: 2, StringField: "second item"},
 			).
 			WithSingleObject("one", 2).
+			WithTextFieldExplicitNull().
+			WithListFieldEmpty().
+			WithMultilineField("some\nmultiline\ncontent").
 			WithDependsOn("some_other_resource.some_name", "other_resource.some_other_name", "third_resource.third_name")
 		expectedOutput := strings.TrimPrefix(`
 resource "snowflake_share" "test" {
@@ -54,6 +57,13 @@ resource "snowflake_share" "test" {
     a = "one"
     b = 2
   }
+  text_field = null
+  list_field = []
+  multiline_field = <<EOT
+some
+multiline
+content
+EOT
   depends_on = [some_other_resource.some_name, other_resource.some_other_name, third_resource.third_name]
 }
 `, "\n")
diff --git a/pkg/acceptance/bettertestspoc/config/custom_variables.go b/pkg/acceptance/bettertestspoc/config/custom_variables.go
index 4fb26cc040..2f8a0f722c 100644
--- a/pkg/acceptance/bettertestspoc/config/custom_variables.go
+++ b/pkg/acceptance/bettertestspoc/config/custom_variables.go
@@ -1,15 +1,46 @@
 package config
 
-import "encoding/json"
+import (
+	"encoding/json"
+	"fmt"
+)
 
-type nullVariable struct{}
+type emptyListVariable struct{}
 
-// MarshalJSON returns the JSON encoding of nullVariable.
-func (v nullVariable) MarshalJSON() ([]byte, error) {
-	return json.Marshal(nil)
+// MarshalJSON returns the JSON encoding of emptyListVariable.
+func (v emptyListVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal([]any{})
 }
 
-// NullVariable returns nullVariable which implements Variable.
-func NullVariable() nullVariable {
-	return nullVariable{}
+// EmptyListVariable returns Variable representing an empty list. This is because the current hcl parser handles empty SetVariable incorrectly.
+func EmptyListVariable() emptyListVariable {
+	return emptyListVariable{}
+}
+
+type replacementPlaceholderVariable struct {
+	placeholder ReplacementPlaceholder
+}
+
+// MarshalJSON returns the JSON encoding of replacementPlaceholderVariable.
+func (v replacementPlaceholderVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal(v.placeholder)
+}
+
+// ReplacementPlaceholderVariable returns Variable containing one of the ReplacementPlaceholder which is later replaced by HclFormatter.
+func ReplacementPlaceholderVariable(placeholder ReplacementPlaceholder) replacementPlaceholderVariable {
+	return replacementPlaceholderVariable{placeholder}
+}
+
+type multilineWrapperVariable struct {
+	content string
+}
+
+// MarshalJSON returns the JSON encoding of multilineWrapperVariable.
+func (v multilineWrapperVariable) MarshalJSON() ([]byte, error) {
+	return json.Marshal(fmt.Sprintf(`%[1]s%[2]s%[1]s`, SnowflakeProviderConfigMultilineMarker, v.content))
+}
+
+// MultilineWrapperVariable returns Variable containing multiline content wrapped with SnowflakeProviderConfigMultilineMarker later replaced by HclFormatter.
+func MultilineWrapperVariable(content string) multilineWrapperVariable {
+	return multilineWrapperVariable{content}
 }
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
index 382a0d2e28..f21a456df8 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/accounts_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -10,8 +12,9 @@ import (
 )
 
 type AccountsModel struct {
-	Accounts tfconfig.Variable `json:"accounts,omitempty"`
-	Pattern  tfconfig.Variable `json:"pattern,omitempty"`
+	Accounts    tfconfig.Variable `json:"accounts,omitempty"`
+	Like        tfconfig.Variable `json:"like,omitempty"`
+	WithHistory tfconfig.Variable `json:"with_history,omitempty"`
 
 	*config.DatasourceModelMeta
 }
@@ -32,14 +35,39 @@ func AccountsWithDefaultMeta() *AccountsModel {
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountsModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountsModel) WithDependsOn(values ...string) *AccountsModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
 
 // accounts attribute type is not yet supported, so WithAccounts can't be generated
 
-func (a *AccountsModel) WithPattern(pattern string) *AccountsModel {
-	a.Pattern = tfconfig.StringVariable(pattern)
+func (a *AccountsModel) WithLike(like string) *AccountsModel {
+	a.Like = tfconfig.StringVariable(like)
+	return a
+}
+
+func (a *AccountsModel) WithWithHistory(withHistory bool) *AccountsModel {
+	a.WithHistory = tfconfig.BoolVariable(withHistory)
 	return a
 }
 
@@ -52,7 +80,12 @@ func (a *AccountsModel) WithAccountsValue(value tfconfig.Variable) *AccountsMode
 	return a
 }
 
-func (a *AccountsModel) WithPatternValue(value tfconfig.Variable) *AccountsModel {
-	a.Pattern = value
+func (a *AccountsModel) WithLikeValue(value tfconfig.Variable) *AccountsModel {
+	a.Like = value
+	return a
+}
+
+func (a *AccountsModel) WithWithHistoryValue(value tfconfig.Variable) *AccountsModel {
+	a.WithHistory = value
 	return a
 }
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go
deleted file mode 100644
index 96e4ec2d28..0000000000
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_ext.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package datasourcemodel
-
-import (
-	"encoding/json"
-)
-
-// Based on https://medium.com/picus-security-engineering/custom-json-marshaller-in-go-and-common-pitfalls-c43fa774db05.
-func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
-	type Alias DatabaseModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(d),
-		DependsOn: d.DependsOn(),
-	})
-}
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
index dd99002397..7ecb98bf7d 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/database_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -44,6 +46,26 @@ func DatabaseWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseModel) WithDependsOn(values ...string) *DatabaseModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
index 1e19163087..53b23120a4 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_ext.go
@@ -1,28 +1,9 @@
 package datasourcemodel
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-// Based on https://medium.com/picus-security-engineering/custom-json-marshaller-in-go-and-common-pitfalls-c43fa774db05.
-func (d *DatabasesModel) MarshalJSON() ([]byte, error) {
-	type Alias DatabasesModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(d),
-		DependsOn: d.DependsOn(),
-	})
-}
-
-func (d *DatabasesModel) WithDependsOn(values ...string) *DatabasesModel {
-	d.SetDependsOn(values...)
-	return d
-}
-
 func (d *DatabasesModel) WithLimit(rows int) *DatabasesModel {
 	return d.WithLimitValue(
 		tfconfig.ObjectVariable(map[string]tfconfig.Variable{
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
index f2adf41b91..bab46b9750 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/databases_model_gen.go
@@ -3,6 +3,8 @@
 package datasourcemodel
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -36,6 +38,26 @@ func DatabasesWithDefaultMeta() *DatabasesModel {
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabasesModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabasesModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabasesModel) WithDependsOn(values ...string) *DatabasesModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
index 0c0da8794d..1b4931c3cf 100644
--- a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates.go
@@ -23,6 +23,14 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(definitionTemplateContent)
 
+	//go:embed templates/marshal_json.tmpl
+	marshalJsonTemplateContent string
+	MarshalJsonTemplate, _     = template.New("marshalJsonTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
+		genhelpers.FirstLetterLowercase,
+		genhelpers.FirstLetter,
+		genhelpers.SnakeCaseToCamel,
+	)).Parse(marshalJsonTemplateContent)
+
 	// TODO [SNOW-1501905]: consider duplicating the builders template from resource (currently same template used for datasources and provider which limits the customization possibilities for just one block type)
-	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, resourcemodel.BuildersTemplate}
+	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, MarshalJsonTemplate, resourcemodel.BuildersTemplate}
 )
diff --git a/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl
new file mode 100644
index 0000000000..96c00d6e1b
--- /dev/null
+++ b/pkg/acceptance/bettertestspoc/config/datasourcemodel/gen/templates/marshal_json.tmpl
@@ -0,0 +1,24 @@
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model/gen.ResourceConfigBuilderModel*/ -}}
+
+{{- $modelName := .Name | printf "%sModel" -}}
+{{- $nameLowerCase := FirstLetterLowercase .Name -}}
+{{- $modelVar := FirstLetter $nameLowerCase }}
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func ({{ $modelVar }} *{{ $modelName }}) MarshalJSON() ([]byte, error) {
+    type Alias {{ $modelName }}
+    return json.Marshal(&struct {
+        *Alias
+        DependsOn []string `json:"depends_on,omitempty"`
+    }{
+        Alias:     (*Alias)({{ $modelVar }}),
+        DependsOn: {{ $modelVar }}.DependsOn(),
+    })
+}
+
+func ({{ $modelVar }} *{{ $modelName }}) WithDependsOn(values ...string) *{{ $modelName }} {
+    {{ $modelVar }}.SetDependsOn(values...)
+    return {{ $modelVar }}
+}
diff --git a/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go b/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
index 632e2d502e..e96fe57d16 100644
--- a/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
+++ b/pkg/acceptance/bettertestspoc/config/hcl_config_provider.go
@@ -10,7 +10,7 @@ import (
 	hclv1parser "github.com/hashicorp/hcl/json/parser"
 )
 
-var DefaultHclConfigProvider = NewHclV1ConfigProvider(unquoteBlockType, fixBlockArguments, fixMultilinePrivateKey, unquoteArguments, unquoteArguments, removeDoubleNewlines, unquoteDependsOnReferences)
+var DefaultHclConfigProvider = NewHclV1ConfigProvider(replaceNullPlaceholders, unquoteBlockType, fixBlockArguments, replaceMultilinePlaceholders, unquoteArguments, unquoteArguments, removeDoubleNewlines, unquoteDependsOnReferences)
 
 // HclConfigProvider defines methods to generate .tf config from .tf.json configs.
 type HclConfigProvider interface {
@@ -79,20 +79,25 @@ func fixBlockArguments(s string) (string, error) {
 	return argumentRegex.ReplaceAllString(s, `$1$2$3$4`), nil
 }
 
-// TODO [SNOW-1501905]: fix new lines replacement totally in this method, consider better placeholders (now there can't be multilinekeys for private key)
-func fixMultilinePrivateKey(s string) (string, error) {
-	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s(.*)%[1]s"`, SnowflakeProviderConfigPrivateKey))
+func replaceNullPlaceholders(s string) (string, error) {
+	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s"`, SnowflakeProviderConfigNull))
 	submatches := argumentRegex.FindStringSubmatch(s)
 	if len(submatches) < 1 {
 		return s, nil
 	} else {
-		return argumentRegex.ReplaceAllString(s, fmt.Sprintf(`<<EOT
-%s
-EOT`, strings.ReplaceAll(submatches[1], `\n`, `
-`))), nil
+		return argumentRegex.ReplaceAllString(s, `null`), nil
 	}
 }
 
+// TODO [SNOW-1501905]: fix new lines replacement totally in this method
+func replaceMultilinePlaceholders(s string) (string, error) {
+	argumentRegex := regexp.MustCompile(fmt.Sprintf(`"%[1]s(.*?)%[1]s"`, SnowflakeProviderConfigMultilineMarker))
+	return strings.ReplaceAll(argumentRegex.ReplaceAllString(s, `<<EOT
+$1
+EOT`), `\n`, `
+`), nil
+}
+
 // Conversion to HCL using hcl v1  does not unquote arguments.
 // Check experiments subpackage for details.
 func unquoteArguments(s string) (string, error) {
diff --git a/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go b/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
index ddd1187d32..431e6c3681 100644
--- a/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
+++ b/pkg/acceptance/bettertestspoc/config/hcl_config_provider_test.go
@@ -35,7 +35,8 @@ func Test_HclProvider(t *testing.T) {
                             "prop1": 1,
                             "prop2": "two"
                         },
-						"multiline_string": "SF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY-----BEGIN PRIVATE KEY-----\nabc\ndef\nghj\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY",
+						"multiline_string": "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER-----BEGIN PRIVATE KEY-----\nabc\ndef\nghj\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER",
+						"multiline_string2": "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER-----BEGIN PRIVATE KEY-----\nklm\nnop\nqrs\n-----END PRIVATE KEY-----\nSF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER",
                         "depends_on": [
                             "some_other_resource.some_name",
                             "other_resource.some_other_name",
@@ -69,6 +70,13 @@ abc
 def
 ghj
 -----END PRIVATE KEY-----
+EOT
+  multiline_string2 = <<EOT
+-----BEGIN PRIVATE KEY-----
+klm
+nop
+qrs
+-----END PRIVATE KEY-----
 EOT
   depends_on = [some_other_resource.some_name, other_resource.some_other_name, data.some_datasource.some_fancy_datasource]
 }
@@ -80,4 +88,19 @@ EOT
 
 		fmt.Printf("%s", result)
 	})
+
+	t.Run("document improper null handling", func(t *testing.T) {
+		resourceJson := `{
+            "resource": {
+                "snowflake_share": {
+                    "test": {
+                        "attribute": null
+                    }
+                }
+            }
+        }`
+
+		_, err := config.DefaultHclConfigProvider.HclFromJson([]byte(resourceJson))
+		require.ErrorContains(t, err, "object expected closing RBRACE got: EOF")
+	})
 }
diff --git a/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go b/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
index a5584008df..0d8850dc20 100644
--- a/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
+++ b/pkg/acceptance/bettertestspoc/config/json_config_provider_test.go
@@ -1,6 +1,7 @@
 package config_test
 
 import (
+	"fmt"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -31,6 +32,43 @@ func Test_JsonConfigProvider(t *testing.T) {
 		assert.Equal(t, expectedResult, string(result))
 	})
 
+	t.Run("test special variables", func(t *testing.T) {
+		model := Some("some_name", "abc").WithTextFieldExplicitNull().WithListFieldEmpty()
+		expectedResult := fmt.Sprintf(`{
+    "resource": {
+        "snowflake_share": {
+            "some_name": {
+                "name": "abc",
+                "text_field": "%[1]s",
+                "list_field": []
+            }
+        }
+    }
+}`, config.SnowflakeProviderConfigNull)
+
+		result, err := config.DefaultJsonConfigProvider.ResourceJsonFromModel(model)
+		require.NoError(t, err)
+		assert.Equal(t, expectedResult, string(result))
+	})
+
+	t.Run("test multiline variable", func(t *testing.T) {
+		model := Some("some_name", "abc").WithMultilineField("some\nmultiline\ncontent")
+		expectedResult := fmt.Sprintf(`{
+    "resource": {
+        "snowflake_share": {
+            "some_name": {
+                "name": "abc",
+                "multiline_field": "%[1]s%[2]s%[1]s"
+            }
+        }
+    }
+}`, config.SnowflakeProviderConfigMultilineMarker, "some\\nmultiline\\ncontent")
+
+		result, err := config.DefaultJsonConfigProvider.ResourceJsonFromModel(model)
+		require.NoError(t, err)
+		assert.Equal(t, expectedResult, string(result))
+	})
+
 	t.Run("test resource json config when proper marshaller is absent", func(t *testing.T) {
 		model := SomeOther("some_name", "abc").WithDependsOn("abc.def")
 		expectedResult := `{
diff --git a/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
index b1000b7931..88cac4abc3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/account_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func AccountWithDefaultMeta(
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountModel) WithDependsOn(values ...string) *AccountModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
index 9fc1cff42a..f906dd1bef 100644
--- a/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/account_parameter_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -41,6 +43,26 @@ func AccountParameterWithDefaultMeta(
 	return a
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (a *AccountParameterModel) MarshalJSON() ([]byte, error) {
+	type Alias AccountParameterModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(a),
+		DependsOn: a.DependsOn(),
+	})
+}
+
+func (a *AccountParameterModel) WithDependsOn(values ...string) *AccountParameterModel {
+	a.SetDependsOn(values...)
+	return a
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
index 813b6b96e3..f9ca857fdb 100644
--- a/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/database_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -57,6 +59,26 @@ func DatabaseWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseModel) WithDependsOn(values ...string) *DatabaseModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
index df3106e1cc..bf59bd4583 100644
--- a/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/database_role_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -43,6 +45,26 @@ func DatabaseRoleWithDefaultMeta(
 	return d
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (d *DatabaseRoleModel) MarshalJSON() ([]byte, error) {
+	type Alias DatabaseRoleModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(d),
+		DependsOn: d.DependsOn(),
+	})
+}
+
+func (d *DatabaseRoleModel) WithDependsOn(values ...string) *DatabaseRoleModel {
+	d.SetDependsOn(values...)
+	return d
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
index 0174c4dc10..3b2acbc841 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_java_model_ext.go
@@ -1,27 +1,16 @@
 package model
 
 import (
-	"encoding/json"
 	"strings"
 
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *FunctionJavaModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionJavaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionJavaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +18,7 @@ func FunctionJavaBasicInline(
 	handler string,
 	functionDefinition string,
 ) *FunctionJavaModel {
-	return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func FunctionJavaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
index 309a53b0a9..a4c20306ee 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_java_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -74,6 +76,26 @@ func FunctionJavaWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionJavaModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionJavaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionJavaModel) WithDependsOn(values ...string) *FunctionJavaModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
index c1429191a6..3c25076aab 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_ext.go
@@ -1,34 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionJavascriptModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionJavascriptModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionJavascriptInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionJavascriptModel {
-	f := &FunctionJavascriptModel{ResourceModelMeta: config.Meta(resourceName, resources.FunctionJavascript)}
-	f.WithDatabase(id.DatabaseName())
-	f.WithFunctionDefinition(functionDefinition)
-	f.WithName(id.Name())
-	f.WithReturnType(returnType)
-	f.WithSchema(id.SchemaName())
-	return f
+	return FunctionJavascript(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()).
+		WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionJavascriptModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
index 742dee099b..e9397ff9b3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_javascript_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func FunctionJavascriptWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionJavascriptModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionJavascriptModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionJavascriptModel) WithDependsOn(values ...string) *FunctionJavascriptModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
index f68dec8871..ad420f07ef 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_python_model_ext.go
@@ -1,27 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionPythonModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionPythonModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionPythonBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, runtimeVersion string, returnType datatypes.DataType, handler string, functionDefinition string) *FunctionPythonModel {
-	return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionPython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionPythonModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionPythonModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
index 17ae5eccaf..8c0ca5904e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_python_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -78,6 +80,26 @@ func FunctionPythonWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionPythonModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionPythonModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionPythonModel) WithDependsOn(values ...string) *FunctionPythonModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
index bb7fcf2847..bf81948f58 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_ext.go
@@ -1,26 +1,16 @@
 package model
 
 import (
-	"encoding/json"
 	"strings"
 
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionScalaModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionScalaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionScalaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +19,7 @@ func FunctionScalaBasicInline(
 	handler string,
 	functionDefinition string,
 ) *FunctionScalaModel {
-	return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinition(functionDefinition)
+	return FunctionScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), runtimeVersion, id.SchemaName()).WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionScalaModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionScalaModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
index 070933fd4e..a3f338847a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_scala_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -78,6 +80,26 @@ func FunctionScalaWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionScalaModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionScalaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionScalaModel) WithDependsOn(values ...string) *FunctionScalaModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
index f01b2e8ffe..32c1cc7325 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_ext.go
@@ -1,34 +1,16 @@
 package model
 
 import (
-	"encoding/json"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (f *FunctionSqlModel) MarshalJSON() ([]byte, error) {
-	type Alias FunctionSqlModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func FunctionSqlBasicInline(resourceName string, id sdk.SchemaObjectIdentifierWithArguments, functionDefinition string, returnType string) *FunctionSqlModel {
-	f := &FunctionSqlModel{ResourceModelMeta: config.Meta(resourceName, resources.FunctionSql)}
-	f.WithDatabase(id.DatabaseName())
-	f.WithFunctionDefinition(functionDefinition)
-	f.WithName(id.Name())
-	f.WithReturnType(returnType)
-	f.WithSchema(id.SchemaName())
-	return f
+	return FunctionSql(resourceName, id.DatabaseName(), functionDefinition, id.Name(), returnType, id.SchemaName()).
+		WithFunctionDefinitionValue(config.MultilineWrapperVariable(functionDefinition))
 }
 
 func (f *FunctionSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *FunctionSqlModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
index 0733c2add4..acc101088a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/function_sql_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -21,7 +23,6 @@ type FunctionSqlModel struct {
 	LogLevel              tfconfig.Variable `json:"log_level,omitempty"`
 	MetricLevel           tfconfig.Variable `json:"metric_level,omitempty"`
 	Name                  tfconfig.Variable `json:"name,omitempty"`
-	NullInputBehavior     tfconfig.Variable `json:"null_input_behavior,omitempty"`
 	ReturnResultsBehavior tfconfig.Variable `json:"return_results_behavior,omitempty"`
 	ReturnType            tfconfig.Variable `json:"return_type,omitempty"`
 	Schema                tfconfig.Variable `json:"schema,omitempty"`
@@ -67,6 +68,26 @@ func FunctionSqlWithDefaultMeta(
 	return f
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (f *FunctionSqlModel) MarshalJSON() ([]byte, error) {
+	type Alias FunctionSqlModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(f),
+		DependsOn: f.DependsOn(),
+	})
+}
+
+func (f *FunctionSqlModel) WithDependsOn(values ...string) *FunctionSqlModel {
+	f.SetDependsOn(values...)
+	return f
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
@@ -123,11 +144,6 @@ func (f *FunctionSqlModel) WithName(name string) *FunctionSqlModel {
 	return f
 }
 
-func (f *FunctionSqlModel) WithNullInputBehavior(nullInputBehavior string) *FunctionSqlModel {
-	f.NullInputBehavior = tfconfig.StringVariable(nullInputBehavior)
-	return f
-}
-
 func (f *FunctionSqlModel) WithReturnResultsBehavior(returnResultsBehavior string) *FunctionSqlModel {
 	f.ReturnResultsBehavior = tfconfig.StringVariable(returnResultsBehavior)
 	return f
@@ -207,11 +223,6 @@ func (f *FunctionSqlModel) WithNameValue(value tfconfig.Variable) *FunctionSqlMo
 	return f
 }
 
-func (f *FunctionSqlModel) WithNullInputBehaviorValue(value tfconfig.Variable) *FunctionSqlModel {
-	f.NullInputBehavior = value
-	return f
-}
-
 func (f *FunctionSqlModel) WithReturnResultsBehaviorValue(value tfconfig.Variable) *FunctionSqlModel {
 	f.ReturnResultsBehavior = value
 	return f
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/model.go b/pkg/acceptance/bettertestspoc/config/model/gen/model.go
index 4d4065eee1..2d2908468c 100644
--- a/pkg/acceptance/bettertestspoc/config/model/gen/model.go
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/model.go
@@ -70,7 +70,7 @@ func ModelFromResourceSchemaDetails(resourceSchemaDetails genhelpers.ResourceSch
 		Attributes: attributes,
 		PreambleModel: PreambleModel{
 			PackageName:               packageWithGenerateDirective,
-			AdditionalStandardImports: []string{},
+			AdditionalStandardImports: []string{"encoding/json"},
 		},
 	}
 }
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/templates.go b/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
index cbb70fff04..4e0bc918d4 100644
--- a/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/templates.go
@@ -21,6 +21,14 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(definitionTemplateContent)
 
+	//go:embed templates/marshal_json.tmpl
+	marshalJsonTemplateContent string
+	MarshalJsonTemplate, _     = template.New("marshalJsonTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
+		genhelpers.FirstLetterLowercase,
+		genhelpers.FirstLetter,
+		genhelpers.SnakeCaseToCamel,
+	)).Parse(marshalJsonTemplateContent)
+
 	//go:embed templates/builders.tmpl
 	buildersTemplateContent string
 	BuildersTemplate, _     = template.New("buildersTemplate").Funcs(genhelpers.BuildTemplateFuncMap(
@@ -29,5 +37,5 @@ var (
 		genhelpers.SnakeCaseToCamel,
 	)).Parse(buildersTemplateContent)
 
-	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, BuildersTemplate}
+	AllTemplates = []*template.Template{PreambleTemplate, DefinitionTemplate, MarshalJsonTemplate, BuildersTemplate}
 )
diff --git a/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl b/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl
new file mode 100644
index 0000000000..96c00d6e1b
--- /dev/null
+++ b/pkg/acceptance/bettertestspoc/config/model/gen/templates/marshal_json.tmpl
@@ -0,0 +1,24 @@
+{{- /*gotype: github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model/gen.ResourceConfigBuilderModel*/ -}}
+
+{{- $modelName := .Name | printf "%sModel" -}}
+{{- $nameLowerCase := FirstLetterLowercase .Name -}}
+{{- $modelVar := FirstLetter $nameLowerCase }}
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func ({{ $modelVar }} *{{ $modelName }}) MarshalJSON() ([]byte, error) {
+    type Alias {{ $modelName }}
+    return json.Marshal(&struct {
+        *Alias
+        DependsOn []string `json:"depends_on,omitempty"`
+    }{
+        Alias:     (*Alias)({{ $modelVar }}),
+        DependsOn: {{ $modelVar }}.DependsOn(),
+    })
+}
+
+func ({{ $modelVar }} *{{ $modelName }}) WithDependsOn(values ...string) *{{ $modelName }} {
+    {{ $modelVar }}.SetDependsOn(values...)
+    return {{ $modelVar }}
+}
diff --git a/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
index cfa415e5aa..cd169d1dd2 100644
--- a/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/legacy_service_user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -111,6 +113,26 @@ func LegacyServiceUserWithDefaultMeta(
 	return l
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (l *LegacyServiceUserModel) MarshalJSON() ([]byte, error) {
+	type Alias LegacyServiceUserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(l),
+		DependsOn: l.DependsOn(),
+	})
+}
+
+func (l *LegacyServiceUserModel) WithDependsOn(values ...string) *LegacyServiceUserModel {
+	l.SetDependsOn(values...)
+	return l
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
index 76079cbde3..e95ea04d8c 100644
--- a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_ext.go
@@ -1,9 +1,10 @@
 package model
 
 import (
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 )
 
 func (p *MaskingPolicyModel) WithArgument(argument []sdk.TableColumnSignature) *MaskingPolicyModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
index 2f9f7213fa..53f4b800e9 100644
--- a/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/masking_policy_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -65,6 +67,26 @@ func MaskingPolicyWithDefaultMeta(
 	return m
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (m *MaskingPolicyModel) MarshalJSON() ([]byte, error) {
+	type Alias MaskingPolicyModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(m),
+		DependsOn: m.DependsOn(),
+	})
+}
+
+func (m *MaskingPolicyModel) WithDependsOn(values ...string) *MaskingPolicyModel {
+	m.SetDependsOn(values...)
+	return m
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
index db5cf93efc..dac9701685 100644
--- a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_custom_clients_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -26,6 +28,7 @@ type OauthIntegrationForCustomClientsModel struct {
 	OauthRefreshTokenValidity   tfconfig.Variable `json:"oauth_refresh_token_validity,omitempty"`
 	OauthUseSecondaryRoles      tfconfig.Variable `json:"oauth_use_secondary_roles,omitempty"`
 	PreAuthorizedRolesList      tfconfig.Variable `json:"pre_authorized_roles_list,omitempty"`
+	RelatedParameters           tfconfig.Variable `json:"related_parameters,omitempty"`
 
 	*config.ResourceModelMeta
 }
@@ -59,6 +62,26 @@ func OauthIntegrationForCustomClientsWithDefaultMeta(
 	return o
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (o *OauthIntegrationForCustomClientsModel) MarshalJSON() ([]byte, error) {
+	type Alias OauthIntegrationForCustomClientsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(o),
+		DependsOn: o.DependsOn(),
+	})
+}
+
+func (o *OauthIntegrationForCustomClientsModel) WithDependsOn(values ...string) *OauthIntegrationForCustomClientsModel {
+	o.SetDependsOn(values...)
+	return o
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
@@ -137,6 +160,8 @@ func (o *OauthIntegrationForCustomClientsModel) WithOauthUseSecondaryRoles(oauth
 
 // pre_authorized_roles_list attribute type is not yet supported, so WithPreAuthorizedRolesList can't be generated
 
+// related_parameters attribute type is not yet supported, so WithRelatedParameters can't be generated
+
 //////////////////////////////////////////
 // below it's possible to set any value //
 //////////////////////////////////////////
@@ -220,3 +245,8 @@ func (o *OauthIntegrationForCustomClientsModel) WithPreAuthorizedRolesListValue(
 	o.PreAuthorizedRolesList = value
 	return o
 }
+
+func (o *OauthIntegrationForCustomClientsModel) WithRelatedParametersValue(value tfconfig.Variable) *OauthIntegrationForCustomClientsModel {
+	o.RelatedParameters = value
+	return o
+}
diff --git a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
index b433aaee4c..240d44952a 100644
--- a/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/oauth_integration_for_partner_applications_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -50,6 +52,26 @@ func OauthIntegrationForPartnerApplicationsWithDefaultMeta(
 	return o
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (o *OauthIntegrationForPartnerApplicationsModel) MarshalJSON() ([]byte, error) {
+	type Alias OauthIntegrationForPartnerApplicationsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(o),
+		DependsOn: o.DependsOn(),
+	})
+}
+
+func (o *OauthIntegrationForPartnerApplicationsModel) WithDependsOn(values ...string) *OauthIntegrationForPartnerApplicationsModel {
+	o.SetDependsOn(values...)
+	return o
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
index 3cbb735d91..cdbe9e2c8e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/primary_connection_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -40,6 +42,26 @@ func PrimaryConnectionWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *PrimaryConnectionModel) MarshalJSON() ([]byte, error) {
+	type Alias PrimaryConnectionModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *PrimaryConnectionModel) WithDependsOn(values ...string) *PrimaryConnectionModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
index b8a1602f79..3440012ee5 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_ext.go
@@ -1,27 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureJavaModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureJavaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureJavaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -30,7 +17,7 @@ func ProcedureJavaBasicInline(
 	procedureDefinition string,
 ) *ProcedureJavaModel {
 	return ProcedureJava(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "11", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func ProcedureJavaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
index ed2be8286e..3bbc9cf011 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_java_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -83,6 +85,26 @@ func ProcedureJavaWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureJavaModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureJavaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureJavaModel) WithDependsOn(values ...string) *ProcedureJavaModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
index 4952c06d38..5e1af42056 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_ext.go
@@ -1,32 +1,21 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureJavascriptModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureJavascriptModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureJavascriptBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
 	returnType datatypes.DataType,
 	procedureDefinition string,
 ) *ProcedureJavascriptModel {
-	return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName())
+	return ProcedureJavascript(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()).
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedureJavascriptModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureJavascriptModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
index c90c47d6fb..4ff708234e 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_javascript_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func ProcedureJavascriptWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureJavascriptModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureJavascriptModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureJavascriptModel) WithDependsOn(values ...string) *ProcedureJavascriptModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
index 3ebd87eca7..fa65b15d42 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_ext.go
@@ -1,26 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedurePythonModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedurePythonModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedurePythonBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +17,7 @@ func ProcedurePythonBasicInline(
 	procedureDefinition string,
 ) *ProcedurePythonModel {
 	return ProcedurePython(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "3.8", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedurePythonModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedurePythonModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
index c69dcab167..330e269b45 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_python_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -82,6 +84,26 @@ func ProcedurePythonWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedurePythonModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedurePythonModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedurePythonModel) WithDependsOn(values ...string) *ProcedurePythonModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
index c78de9dbcc..a307f5b198 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_ext.go
@@ -1,26 +1,14 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureScalaModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureScalaModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureScalaBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
@@ -29,7 +17,7 @@ func ProcedureScalaBasicInline(
 	procedureDefinition string,
 ) *ProcedureScalaModel {
 	return ProcedureScala(resourceName, id.DatabaseName(), handler, id.Name(), returnType.ToSql(), "2.12", id.SchemaName(), "1.14.0").
-		WithProcedureDefinition(procedureDefinition)
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func ProcedureScalaBasicStaged(
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
index 9df0441308..4ec12d5ebf 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_scala_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -83,6 +85,26 @@ func ProcedureScalaWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureScalaModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureScalaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureScalaModel) WithDependsOn(values ...string) *ProcedureScalaModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
index 0cb2a2bf8c..a266504b2f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_ext.go
@@ -1,32 +1,21 @@
 package model
 
 import (
-	"encoding/json"
-
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 )
 
-func (f *ProcedureSqlModel) MarshalJSON() ([]byte, error) {
-	type Alias ProcedureSqlModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(f),
-		DependsOn: f.DependsOn(),
-	})
-}
-
 func ProcedureSqlBasicInline(
 	resourceName string,
 	id sdk.SchemaObjectIdentifierWithArguments,
 	returnType datatypes.DataType,
 	procedureDefinition string,
 ) *ProcedureSqlModel {
-	return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName())
+	return ProcedureSql(resourceName, id.DatabaseName(), id.Name(), procedureDefinition, returnType.ToSql(), id.SchemaName()).
+		WithProcedureDefinitionValue(config.MultilineWrapperVariable(procedureDefinition))
 }
 
 func (f *ProcedureSqlModel) WithArgument(argName string, argDataType datatypes.DataType) *ProcedureSqlModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
index 274dfc5b50..1d020ac852 100644
--- a/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/procedure_sql_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -67,6 +69,26 @@ func ProcedureSqlWithDefaultMeta(
 	return p
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (p *ProcedureSqlModel) MarshalJSON() ([]byte, error) {
+	type Alias ProcedureSqlModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(p),
+		DependsOn: p.DependsOn(),
+	})
+}
+
+func (p *ProcedureSqlModel) WithDependsOn(values ...string) *ProcedureSqlModel {
+	p.SetDependsOn(values...)
+	return p
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
index e2ccebc599..fbe44e834d 100644
--- a/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/resource_monitor_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -45,6 +47,26 @@ func ResourceMonitorWithDefaultMeta(
 	return r
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (r *ResourceMonitorModel) MarshalJSON() ([]byte, error) {
+	type Alias ResourceMonitorModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(r),
+		DependsOn: r.DependsOn(),
+	})
+}
+
+func (r *ResourceMonitorModel) WithDependsOn(values ...string) *ResourceMonitorModel {
+	r.SetDependsOn(values...)
+	return r
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
index 7ede96b9e0..3419c5198d 100644
--- a/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/row_access_policy_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func RowAccessPolicyWithDefaultMeta(
 	return r
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (r *RowAccessPolicyModel) MarshalJSON() ([]byte, error) {
+	type Alias RowAccessPolicyModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(r),
+		DependsOn: r.DependsOn(),
+	})
+}
+
+func (r *RowAccessPolicyModel) WithDependsOn(values ...string) *RowAccessPolicyModel {
+	r.SetDependsOn(values...)
+	return r
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
index e83ac5058d..c541248b2b 100644
--- a/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/schema_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -62,6 +64,26 @@ func SchemaWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SchemaModel) MarshalJSON() ([]byte, error) {
+	type Alias SchemaModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SchemaModel) WithDependsOn(values ...string) *SchemaModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
index f1ee4f7024..2adb3f537f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secondary_connection_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -44,6 +46,26 @@ func SecondaryConnectionWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecondaryConnectionModel) MarshalJSON() ([]byte, error) {
+	type Alias SecondaryConnectionModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecondaryConnectionModel) WithDependsOn(values ...string) *SecondaryConnectionModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
index 144a4fc212..c17f2dda82 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_authorization_code_grant_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -64,6 +66,26 @@ func SecretWithAuthorizationCodeGrantWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithAuthorizationCodeGrantModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithAuthorizationCodeGrantModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithAuthorizationCodeGrantModel) WithDependsOn(values ...string) *SecretWithAuthorizationCodeGrantModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
index b3c0f4ee83..461a025dda 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_basic_authentication_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func SecretWithBasicAuthenticationWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithBasicAuthenticationModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithBasicAuthenticationModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithBasicAuthenticationModel) WithDependsOn(values ...string) *SecretWithBasicAuthenticationModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
index bd69bffbb2..3f9a1fd5a2 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_client_credentials_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func SecretWithClientCredentialsWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithClientCredentialsModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithClientCredentialsModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithClientCredentialsModel) WithDependsOn(values ...string) *SecretWithClientCredentialsModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
index c1cbe7d05e..9c25164528 100644
--- a/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/secret_with_generic_string_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -54,6 +56,26 @@ func SecretWithGenericStringWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *SecretWithGenericStringModel) MarshalJSON() ([]byte, error) {
+	type Alias SecretWithGenericStringModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *SecretWithGenericStringModel) WithDependsOn(values ...string) *SecretWithGenericStringModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
index 930ec8f644..d98651c133 100644
--- a/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/service_user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -109,6 +111,26 @@ func ServiceUserWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *ServiceUserModel) MarshalJSON() ([]byte, error) {
+	type Alias ServiceUserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *ServiceUserModel) WithDependsOn(values ...string) *ServiceUserModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
index cc2270d46c..8d8c8220ae 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_directory_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -56,6 +58,26 @@ func StreamOnDirectoryTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnDirectoryTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnDirectoryTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnDirectoryTableModel) WithDependsOn(values ...string) *StreamOnDirectoryTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
index de66941879..3ee74c0414 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_external_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -59,6 +61,26 @@ func StreamOnExternalTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnExternalTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnExternalTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnExternalTableModel) WithDependsOn(values ...string) *StreamOnExternalTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
index 3c337e9e9a..65905b66bc 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_table_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -60,6 +62,26 @@ func StreamOnTableWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnTableModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnTableModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnTableModel) WithDependsOn(values ...string) *StreamOnTableModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
index d4942dd8a6..5e71b69066 100644
--- a/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/stream_on_view_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -60,6 +62,26 @@ func StreamOnViewWithDefaultMeta(
 	return s
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (s *StreamOnViewModel) MarshalJSON() ([]byte, error) {
+	type Alias StreamOnViewModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(s),
+		DependsOn: s.DependsOn(),
+	})
+}
+
+func (s *StreamOnViewModel) WithDependsOn(values ...string) *StreamOnViewModel {
+	s.SetDependsOn(values...)
+	return s
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
index 12457d4973..5ced2b4984 100644
--- a/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/tag_association_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -54,6 +56,26 @@ func TagAssociationWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TagAssociationModel) MarshalJSON() ([]byte, error) {
+	type Alias TagAssociationModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TagAssociationModel) WithDependsOn(values ...string) *TagAssociationModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
index a649154cb2..908ff3dd76 100644
--- a/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/tag_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -50,6 +52,26 @@ func TagWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TagModel) MarshalJSON() ([]byte, error) {
+	type Alias TagModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TagModel) WithDependsOn(values ...string) *TagModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
index 306c525fad..dea8c6c679 100644
--- a/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/task_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -124,6 +126,26 @@ func TaskWithDefaultMeta(
 	return t
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (t *TaskModel) MarshalJSON() ([]byte, error) {
+	type Alias TaskModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(t),
+		DependsOn: t.DependsOn(),
+	})
+}
+
+func (t *TaskModel) WithDependsOn(values ...string) *TaskModel {
+	t.SetDependsOn(values...)
+	return t
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
index 9bf0cc44de..39d5865205 100644
--- a/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/user_model_ext.go
@@ -63,7 +63,7 @@ func (u *UserModel) WithNetworkPolicyId(networkPolicy sdk.AccountObjectIdentifie
 }
 
 func (u *UserModel) WithNullPassword() *UserModel {
-	return u.WithPasswordValue(config.NullVariable())
+	return u.WithPasswordValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 }
 
 func (u *UserModel) WithDefaultSecondaryRolesOptionEnum(option sdk.SecondaryRolesOption) *UserModel {
diff --git a/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
index 32eb8218ee..f2c945fbf3 100644
--- a/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/user_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -116,6 +118,26 @@ func UserWithDefaultMeta(
 	return u
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (u *UserModel) MarshalJSON() ([]byte, error) {
+	type Alias UserModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(u),
+		DependsOn: u.DependsOn(),
+	})
+}
+
+func (u *UserModel) WithDependsOn(values ...string) *UserModel {
+	u.SetDependsOn(values...)
+	return u
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go b/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
index 3d213bf0b8..b7a1a3675f 100644
--- a/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/model/view_model_ext.go
@@ -1,29 +1,11 @@
 package model
 
 import (
-	"encoding/json"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
 )
 
-func (v *ViewModel) MarshalJSON() ([]byte, error) {
-	type Alias ViewModel
-	return json.Marshal(&struct {
-		*Alias
-		DependsOn []string `json:"depends_on,omitempty"`
-	}{
-		Alias:     (*Alias)(v),
-		DependsOn: v.DependsOn(),
-	})
-}
-
-func (v *ViewModel) WithDependsOn(values ...string) *ViewModel {
-	v.SetDependsOn(values...)
-	return v
-}
-
 func (v *ViewModel) WithColumnNames(columnNames ...string) *ViewModel {
 	return v.WithColumnValue(config.TupleVariable(
 		collections.Map(columnNames, func(columnName string) config.Variable {
diff --git a/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
index 1afe8859d8..856bd7556b 100644
--- a/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/view_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -63,6 +65,26 @@ func ViewWithDefaultMeta(
 	return v
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (v *ViewModel) MarshalJSON() ([]byte, error) {
+	type Alias ViewModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(v),
+		DependsOn: v.DependsOn(),
+	})
+}
+
+func (v *ViewModel) WithDependsOn(values ...string) *ViewModel {
+	v.SetDependsOn(values...)
+	return v
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go b/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
index 388b71ce33..a2ea994661 100644
--- a/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
+++ b/pkg/acceptance/bettertestspoc/config/model/warehouse_model_gen.go
@@ -3,6 +3,8 @@
 package model
 
 import (
+	"encoding/json"
+
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -52,6 +54,26 @@ func WarehouseWithDefaultMeta(
 	return w
 }
 
+///////////////////////////////////////////////////////
+// set proper json marshalling and handle depends on //
+///////////////////////////////////////////////////////
+
+func (w *WarehouseModel) MarshalJSON() ([]byte, error) {
+	type Alias WarehouseModel
+	return json.Marshal(&struct {
+		*Alias
+		DependsOn []string `json:"depends_on,omitempty"`
+	}{
+		Alias:     (*Alias)(w),
+		DependsOn: w.DependsOn(),
+	})
+}
+
+func (w *WarehouseModel) WithDependsOn(values ...string) *WarehouseModel {
+	w.SetDependsOn(values...)
+	return w
+}
+
 /////////////////////////////////
 // below all the proper values //
 /////////////////////////////////
diff --git a/pkg/acceptance/bettertestspoc/config/placeholders.go b/pkg/acceptance/bettertestspoc/config/placeholders.go
index 21b5fe10e6..c54e892d79 100644
--- a/pkg/acceptance/bettertestspoc/config/placeholders.go
+++ b/pkg/acceptance/bettertestspoc/config/placeholders.go
@@ -2,4 +2,7 @@ package config
 
 type ReplacementPlaceholder string
 
-const SnowflakeProviderConfigPrivateKey ReplacementPlaceholder = "SF_TF_TEST_MULTILINE_PLACEHOLDER_PRIVATE_KEY"
+const (
+	SnowflakeProviderConfigNull            ReplacementPlaceholder = "SF_TF_TEST_NULL_PLACEHOLDER"
+	SnowflakeProviderConfigMultilineMarker ReplacementPlaceholder = "SF_TF_TEST_MULTILINE_MARKER_PLACEHOLDER"
+)
diff --git a/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go b/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
index e66051c0ae..942961149d 100644
--- a/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
+++ b/pkg/acceptance/bettertestspoc/config/providermodel/snowflake_model_ext.go
@@ -2,7 +2,6 @@ package providermodel
 
 import (
 	"encoding/json"
-	"fmt"
 
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
@@ -40,7 +39,7 @@ func (m *SnowflakeModel) WithAuthenticatorType(authenticationType sdk.Authentica
 }
 
 func (m *SnowflakeModel) WithPrivateKeyMultiline(privateKey string) *SnowflakeModel {
-	return m.WithPrivateKey(fmt.Sprintf(`%[1]s%[2]s%[1]s`, config.SnowflakeProviderConfigPrivateKey, privateKey))
+	return m.WithPrivateKeyValue(config.MultilineWrapperVariable(privateKey))
 }
 
 func (m *SnowflakeModel) WithClientStoreTemporaryCredentialBool(clientStoreTemporaryCredential bool) *SnowflakeModel {
diff --git a/pkg/acceptance/bettertestspoc/config/resource_model_test.go b/pkg/acceptance/bettertestspoc/config/resource_model_test.go
index 1d30583f6a..aa88f7b45d 100644
--- a/pkg/acceptance/bettertestspoc/config/resource_model_test.go
+++ b/pkg/acceptance/bettertestspoc/config/resource_model_test.go
@@ -26,6 +26,10 @@ type SomeModel struct {
 	ObjectList   tfconfig.Variable `json:"object_list,omitempty"`
 	SingleObject tfconfig.Variable `json:"single_object,omitempty"`
 
+	TextField      tfconfig.Variable `json:"text_field,omitempty"`
+	ListField      tfconfig.Variable `json:"list_field,omitempty"`
+	MultilineField tfconfig.Variable `json:"multiline_field,omitempty"`
+
 	*config.ResourceModelMeta
 }
 
@@ -91,6 +95,21 @@ func (m *SomeModel) WithSingleObject(a string, b int) *SomeModel {
 	return m
 }
 
+func (m *SomeModel) WithTextFieldExplicitNull() *SomeModel {
+	m.TextField = config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull)
+	return m
+}
+
+func (m *SomeModel) WithListFieldEmpty() *SomeModel {
+	m.ListField = config.EmptyListVariable()
+	return m
+}
+
+func (m *SomeModel) WithMultilineField(multilineContent string) *SomeModel {
+	m.MultilineField = config.MultilineWrapperVariable(multilineContent)
+	return m
+}
+
 func (m *SomeModel) WithDependsOn(values ...string) *SomeModel {
 	m.SetDependsOn(values...)
 	return m
diff --git a/pkg/acceptance/helpers/function_client.go b/pkg/acceptance/helpers/function_client.go
index 600027fe2c..98fd9464e0 100644
--- a/pkg/acceptance/helpers/function_client.go
+++ b/pkg/acceptance/helpers/function_client.go
@@ -3,6 +3,7 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
@@ -200,92 +201,95 @@ func (c *FunctionClient) DescribeDetails(t *testing.T, id sdk.SchemaObjectIdenti
 	return c.client().DescribeDetails(ctx, id)
 }
 
+// formatFunctionDefinition removes the first newline and replaces all tabs with spaces.
+func (c *FunctionClient) formatFunctionDefinition(definition string) string {
+	return strings.Replace(strings.ReplaceAll(definition, "\t", "  "), "\n", "", 1)
+}
+
 func (c *FunctionClient) SampleJavaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		public static String %[2]s(String %[3]s) {
 			return %[3]s;
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *FunctionClient) SampleJavaDefinitionNoArgs(t *testing.T, className string, funcName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		public static String %[2]s() {
-			return "hello";
+			return null;
 		}
 	}
-`, className, funcName)
+`, className, funcName))
 }
 
 func (c *FunctionClient) SampleJavascriptDefinition(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
-	if (%[1]s <= 0) {
+	return c.formatFunctionDefinition(fmt.Sprintf(`
+	if (%[1]s == 0) {
 		return 1;
 	} else {
-		var result = 1;
-		for (var i = 2; i <= %[1]s; i++) {
-			result = result * i;
-		}
-		return result;
+		return 2;
 	}
-`, argName)
+`, argName))
 }
 
 func (c *FunctionClient) SampleJavascriptDefinitionNoArgs(t *testing.T) string {
 	t.Helper()
-	return `return 1;`
+	return c.formatFunctionDefinition(`
+return 1;
+`)
 }
 
 func (c *FunctionClient) SamplePythonDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 def %[1]s(%[2]s):
-	result = ""
+	result = ''
 	for a in range(5):
 		result += %[2]s
 	return result
-`, funcName, argName)
+`, funcName, argName))
 }
 
 func (c *FunctionClient) SampleScalaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 	class %[1]s {
 		def %[2]s(%[3]s : String): String = {
 			return %[3]s
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 // TODO [SNOW-1850370]: use input argument like in other samples
 func (c *FunctionClient) SampleSqlDefinition(t *testing.T) string {
 	t.Helper()
 
-	return "3.141592654::FLOAT"
+	return c.formatFunctionDefinition("3.141592654::FLOAT")
 }
 
 func (c *FunctionClient) SampleSqlDefinitionWithArgument(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatFunctionDefinition(fmt.Sprintf(`
 %s
-`, argName)
+`, argName))
 }
 
 func (c *FunctionClient) PythonIdentityDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf("def %[1]s(%[2]s): %[2]s", funcName, argName)
+	return c.formatFunctionDefinition(fmt.Sprintf("def %[1]s(%[2]s): %[2]s", funcName, argName))
 }
diff --git a/pkg/acceptance/helpers/procedure_client.go b/pkg/acceptance/helpers/procedure_client.go
index b35f9239df..6fe9cd686a 100644
--- a/pkg/acceptance/helpers/procedure_client.go
+++ b/pkg/acceptance/helpers/procedure_client.go
@@ -3,6 +3,7 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
@@ -164,94 +165,94 @@ func (c *ProcedureClient) DescribeDetails(t *testing.T, id sdk.SchemaObjectIdent
 	return c.client().DescribeDetails(ctx, id)
 }
 
+// formatProcedureDefinition removes the first newline and replaces all tabs with spaces.
+func (c *ProcedureClient) formatProcedureDefinition(definition string) string {
+	return strings.Replace(strings.ReplaceAll(definition, "\t", "  "), "\n", "", 1)
+}
+
 // Session argument is needed: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-java#data-access-example
 // More references: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-java
 func (c *ProcedureClient) SampleJavaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.*;
 	class %[1]s {
 		public static String %[2]s(Session session, String %[3]s) {
 			return %[3]s;
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *ProcedureClient) SampleJavaDefinitionNoArgs(t *testing.T, className string, funcName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.*;
 	class %[1]s {
 		public static String %[2]s(Session session) {
-			return "hello";
+			return null;
 		}
 	}
-`, className, funcName)
+`, className, funcName))
 }
 
 // For more references: https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-javascript
 func (c *ProcedureClient) SampleJavascriptDefinition(t *testing.T, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
-	if (%[1]s <= 0) {
+	return c.formatProcedureDefinition(fmt.Sprintf(`
+	if (%[1]s == 0) {
 		return 1;
 	} else {
-		var result = 1;
-		for (var i = 2; i <= %[1]s; i++) {
-			result = result * i;
-		}
-		return result;
+		return 2;
 	}
-`, argName)
+`, argName))
 }
 
 func (c *ProcedureClient) SamplePythonDefinition(t *testing.T, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 def %[1]s(%[2]s):
-	result = ""
+	result = ''
 	for a in range(5):
 		result += %[2]s
 	return result
-`, funcName, argName)
+`, funcName, argName))
 }
 
 // https://docs.snowflake.com/en/developer-guide/stored-procedure/stored-procedures-scala
 func (c *ProcedureClient) SampleScalaDefinition(t *testing.T, className string, funcName string, argName string) string {
 	t.Helper()
 
-	return fmt.Sprintf(`
+	return c.formatProcedureDefinition(fmt.Sprintf(`
 	import com.snowflake.snowpark_java.Session
-
 	class %[1]s {
 		def %[2]s(session : Session, %[3]s : String): String = {
 			return %[3]s
 		}
 	}
-`, className, funcName, argName)
+`, className, funcName, argName))
 }
 
 func (c *ProcedureClient) SampleSqlDefinition(t *testing.T) string {
 	t.Helper()
 
-	return `
+	return c.formatProcedureDefinition(`
 BEGIN
 	RETURN 3.141592654::FLOAT;
 END;
-`
+`)
 }
 
 func (c *ProcedureClient) SampleSqlDefinitionWithArgument(t *testing.T) string {
 	t.Helper()
 
-	return `
+	return c.formatProcedureDefinition(`
 BEGIN
   RETURN message;
 END;
-`
+`)
 }
diff --git a/pkg/datasources/connections_acceptance_test.go b/pkg/datasources/connections_acceptance_test.go
index 0e91f4b6bd..2ab5dfa1ca 100644
--- a/pkg/datasources/connections_acceptance_test.go
+++ b/pkg/datasources/connections_acceptance_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	accConfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -37,7 +37,7 @@ func TestAcc_Connections_Minimal(t *testing.T) {
 
 	primaryConnectionAsExternalId := sdk.NewExternalObjectIdentifier(accountId, id)
 
-	dataConnections := accConfig.FromModel(t, connectionModel) + connectionsData()
+	dataConnections := accconfig.FromModels(t, connectionModel) + connectionsData()
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -85,7 +85,7 @@ func TestAcc_Connections_Complete(t *testing.T) {
 
 	primaryConnectionAsExternalId := sdk.NewExternalObjectIdentifier(accountId, id)
 
-	dataConnections := accConfig.FromModel(t, connectionModel) + connectionsData()
+	dataConnections := accconfig.FromModels(t, connectionModel) + connectionsData()
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -135,9 +135,9 @@ func TestAcc_Connections_Filtering(t *testing.T) {
 	connectionModelTwo := model.PrimaryConnection("c2", idTwo.Name())
 	connectionModelThree := model.PrimaryConnection("c3", idThree.Name())
 
-	configWithLike := accConfig.FromModel(t, connectionModelOne) +
-		accConfig.FromModel(t, connectionModelTwo) +
-		accConfig.FromModel(t, connectionModelThree)
+	configWithLike := accconfig.FromModels(t, connectionModelOne) +
+		accconfig.FromModels(t, connectionModelTwo) +
+		accconfig.FromModels(t, connectionModelThree)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -181,8 +181,8 @@ func TestAcc_Connections_FilteringWithReplica(t *testing.T) {
 	connectionModelOne := model.PrimaryConnection("c1", idOne.Name())
 	connectionModelTwo := model.SecondaryConnection("c2", primaryConnectionAsExternalId.FullyQualifiedName(), idTwo.Name())
 
-	configWithLike := accConfig.FromModel(t, connectionModelOne) +
-		accConfig.FromModel(t, connectionModelTwo)
+	configWithLike := accconfig.FromModels(t, connectionModelOne) +
+		accconfig.FromModels(t, connectionModelTwo)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/datasources/secrets_acceptance_test.go b/pkg/datasources/secrets_acceptance_test.go
index 122755c052..c2c8d47bb2 100644
--- a/pkg/datasources/secrets_acceptance_test.go
+++ b/pkg/datasources/secrets_acceptance_test.go
@@ -8,9 +8,10 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
-	accConfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
@@ -35,7 +36,7 @@ func TestAcc_Secrets_WithClientCredentials(t *testing.T) {
 
 	secretModel := model.SecretWithClientCredentials("test", integrationId.Name(), id.DatabaseName(), id.SchemaName(), id.Name(), []string{"username", "test_scope"})
 
-	dataSecretsClientCredentials := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsClientCredentials := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -90,7 +91,7 @@ func TestAcc_Secrets_WithAuthorizationCodeGrant(t *testing.T) {
 
 	secretModel := model.SecretWithAuthorizationCodeGrant("test", integrationId.Name(), id.DatabaseName(), id.SchemaName(), id.Name(), "test_token", time.Now().Add(24*time.Hour).Format(time.DateTime)).WithComment("test_comment")
 
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -131,7 +132,7 @@ func TestAcc_Secrets_WithBasicAuthentication(t *testing.T) {
 	id := acc.TestClient().Ids.RandomSchemaObjectIdentifier()
 
 	secretModel := model.SecretWithBasicAuthentication("test", id.DatabaseName(), id.Name(), "test_passwd", id.SchemaName(), "test_username")
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -172,7 +173,7 @@ func TestAcc_Secrets_WithGenericString(t *testing.T) {
 
 	secretModel := model.SecretWithGenericString("test", id.DatabaseName(), id.Name(), id.SchemaName(), "test_secret_string")
 
-	dataSecretsAuthorizationCode := accConfig.FromModel(t, secretModel) + secretsData(secretModel, id)
+	dataSecretsAuthorizationCode := accconfig.FromModels(t, secretModel) + secretsData(secretModel, id)
 
 	dsName := "data.snowflake_secrets.test"
 	resource.Test(t, resource.TestCase{
@@ -209,7 +210,7 @@ func TestAcc_Secrets_WithGenericString(t *testing.T) {
 	})
 }
 
-func secretsData(secretModel accConfig.ResourceModel, secretId sdk.SchemaObjectIdentifier) string {
+func secretsData(secretModel accconfig.ResourceModel, secretId sdk.SchemaObjectIdentifier) string {
 	return fmt.Sprintf(`
     data "snowflake_secrets" "test" {
         depends_on = [%s.test]
@@ -247,11 +248,11 @@ func TestAcc_Secrets_Filtering(t *testing.T) {
 	secretModelAuthorizationCodeGrant := model.SecretWithAuthorizationCodeGrant("s4", integrationId.Name(), idFour.DatabaseName(), idFour.SchemaName(), idFour.Name(), "test_token", time.Now().Add(24*time.Hour).Format(time.DateTime))
 	secretModelInDifferentSchema := model.SecretWithBasicAuthentication("s5", idFive.DatabaseName(), idFive.Name(), "test_passwd", idFive.SchemaName(), "test_username")
 
-	multipleSecretModels := accConfig.FromModel(t, secretModelBasicAuth) +
-		accConfig.FromModel(t, secretModelGenericString) +
-		accConfig.FromModel(t, secretModelClientCredentials) +
-		accConfig.FromModel(t, secretModelAuthorizationCodeGrant) +
-		accConfig.FromModel(t, secretModelInDifferentSchema)
+	multipleSecretModels := accconfig.FromModels(t, secretModelBasicAuth) +
+		accconfig.FromModels(t, secretModelGenericString) +
+		accconfig.FromModels(t, secretModelClientCredentials) +
+		accconfig.FromModels(t, secretModelAuthorizationCodeGrant) +
+		accconfig.FromModels(t, secretModelInDifferentSchema)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/datasources/streams_acceptance_test.go b/pkg/datasources/streams_acceptance_test.go
index 1b732d92c4..a119d03fcb 100644
--- a/pkg/datasources/streams_acceptance_test.go
+++ b/pkg/datasources/streams_acceptance_test.go
@@ -6,17 +6,17 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -130,7 +130,7 @@ func TestAcc_StreamOnTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, streamOnTable) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, streamOnTable) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -195,7 +195,7 @@ func TestAcc_StreamOnExternalTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -254,7 +254,7 @@ func TestAcc_StreamOnDirectoryTable(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -317,7 +317,7 @@ func TestAcc_StreamOnView(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model) + streamsDatasource(id.Name(), resourceName),
+				Config: config.FromModels(t, model) + streamsDatasource(id.Name(), resourceName),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr(dsName, "streams.#", "1")),
 					resourceshowoutputassert.StreamsDatasourceShowOutput(t, "snowflake_streams.test").
@@ -390,13 +390,13 @@ func TestAcc_Streams_Filtering(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + streamsDatasourceLike(id1.Name()),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + streamsDatasourceLike(id1.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_streams.test", "streams.#", "1"),
 				),
 			},
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + streamsDatasourceLike(prefix+"%"),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + streamsDatasourceLike(prefix+"%"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_streams.test", "streams.#", "2"),
 				),
diff --git a/pkg/datasources/tags_acceptance_test.go b/pkg/datasources/tags_acceptance_test.go
index a29eacc082..5f53e77e28 100644
--- a/pkg/datasources/tags_acceptance_test.go
+++ b/pkg/datasources/tags_acceptance_test.go
@@ -6,16 +6,16 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	testconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -93,13 +93,13 @@ func TestAcc_Tags_Filtering(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + tagsDatasourceLike(id1.Name()),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + tagsDatasourceLike(id1.Name()),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_tags.test", "tags.#", "1"),
 				),
 			},
 			{
-				Config: testconfig.FromModel(t, model1) + testconfig.FromModel(t, model2) + testconfig.FromModel(t, model3) + tagsDatasourceLike(prefix+"%"),
+				Config: testconfig.FromModels(t, model1) + testconfig.FromModels(t, model2) + testconfig.FromModels(t, model3) + tagsDatasourceLike(prefix+"%"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_tags.test", "tags.#", "2"),
 				),
diff --git a/pkg/datasources/usage_tracking_acceptance_test.go b/pkg/datasources/usage_tracking_acceptance_test.go
index a2146f7bed..17578114df 100644
--- a/pkg/datasources/usage_tracking_acceptance_test.go
+++ b/pkg/datasources/usage_tracking_acceptance_test.go
@@ -5,24 +5,21 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/datasources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/hashicorp/terraform-plugin-testing/tfversion"
-
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/datasources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CompleteUsageTracking(t *testing.T) {
@@ -57,7 +54,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 		PreCheck: func() { acc.TestAccPreCheck(t) },
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, schemaModel) + schemaDatasourceConfigWithDependency(schemaModel.ResourceReference(), id),
+				Config: config.FromModels(t, schemaModel) + schemaDatasourceConfigWithDependency(schemaModel.ResourceReference(), id),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModel.ResourceReference()).
 						HasNameString(id.Name()),
diff --git a/pkg/datasources/users_acceptance_test.go b/pkg/datasources/users_acceptance_test.go
index 109761d3b5..69b687a9cc 100644
--- a/pkg/datasources/users_acceptance_test.go
+++ b/pkg/datasources/users_acceptance_test.go
@@ -46,8 +46,8 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -60,7 +60,7 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.User),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.User),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -122,7 +122,7 @@ func TestAcc_Users_PersonUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.User),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.User),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -204,8 +204,8 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{
@@ -217,7 +217,7 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.ServiceUser),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.ServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -279,7 +279,7 @@ func TestAcc_Users_ServiceUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.ServiceUser),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.ServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -364,8 +364,8 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	resource.Test(t, resource.TestCase{
@@ -377,7 +377,7 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.LegacyServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModelAllAttributes) + datasourceWithLike(resources.LegacyServiceUser),
+				Config: config.FromModels(t, userModelAllAttributes) + datasourceWithLike(resources.LegacyServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -439,7 +439,7 @@ func TestAcc_Users_LegacyServiceUser(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelNoAttributes) + datasourceWithLike(resources.LegacyServiceUser),
+				Config: config.FromModels(t, userModelNoAttributes) + datasourceWithLike(resources.LegacyServiceUser),
 				Check: assert.AssertThat(t,
 					assert.Check(resource.TestCheckResourceAttr("data.snowflake_users.test", "users.#", "1")),
 					resourceshowoutputassert.UsersDatasourceShowOutput(t, "snowflake_users.test").
@@ -512,7 +512,7 @@ func TestAcc_Users_DifferentFiltering(t *testing.T) {
 	user2Model := model.User("u2", id2.Name())
 	user3Model := model.User("u3", id3.Name())
 
-	allUsersConfig := config.FromModel(t, userModel) + config.FromModel(t, user2Model) + config.FromModel(t, user3Model)
+	allUsersConfig := config.FromModels(t, userModel) + config.FromModels(t, user2Model) + config.FromModels(t, user3Model)
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
diff --git a/pkg/provider/provider_acceptance_test.go b/pkg/provider/provider_acceptance_test.go
index e8fb41a1ca..415a81667a 100644
--- a/pkg/provider/provider_acceptance_test.go
+++ b/pkg/provider/provider_acceptance_test.go
@@ -12,7 +12,6 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	internalprovider "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
@@ -23,6 +22,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testprofiles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/previewfeatures"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
diff --git a/pkg/resources/account_acceptance_test.go b/pkg/resources/account_acceptance_test.go
index 3b2e699d9f..96b4dcd781 100644
--- a/pkg/resources/account_acceptance_test.go
+++ b/pkg/resources/account_acceptance_test.go
@@ -5,25 +5,24 @@ import (
 	"regexp"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -50,7 +49,7 @@ func TestAcc_Account_Minimal(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -101,7 +100,7 @@ func TestAcc_Account_Minimal(t *testing.T) {
 			},
 			{
 				ResourceName: configModel.ResourceReference(),
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedAccountResource(t, helpers.EncodeResourceIdentifier(accountId)).
@@ -160,7 +159,7 @@ func TestAcc_Account_Complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -211,7 +210,7 @@ func TestAcc_Account_Complete(t *testing.T) {
 			},
 			{
 				ResourceName: configModel.ResourceReference(),
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedAccountResource(t, helpers.EncodeResourceIdentifier(accountId)).
@@ -266,7 +265,7 @@ func TestAcc_Account_Rename(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -283,7 +282,7 @@ func TestAcc_Account_Rename(t *testing.T) {
 						plancheck.ExpectResourceAction(newConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, newConfigModel),
+				Config: config.FromModels(t, newConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, newConfigModel.ResourceReference()).
 						HasNameString(newId).
@@ -333,7 +332,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create with ORGADMIN enabled
 			{
-				Config: config.FromModel(t, configModelWithOrgAdminTrue),
+				Config: config.FromModels(t, configModelWithOrgAdminTrue),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithOrgAdminTrue.ResourceReference()).
 						HasNameString(id).
@@ -353,7 +352,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithOrgAdminFalse.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithOrgAdminFalse),
+				Config: config.FromModels(t, configModelWithOrgAdminFalse),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithOrgAdminFalse.ResourceReference()).
 						HasNameString(id).
@@ -373,7 +372,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithoutOrgAdmin.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutOrgAdmin),
+				Config: config.FromModels(t, configModelWithoutOrgAdmin),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithoutOrgAdmin.ResourceReference()).
 						HasNameString(id).
@@ -401,7 +400,7 @@ func TestAcc_Account_IsOrgAdmin(t *testing.T) {
 						plancheck.ExpectResourceAction(configModelWithoutOrgAdmin.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutOrgAdmin),
+				Config: config.FromModels(t, configModelWithoutOrgAdmin),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModelWithoutOrgAdmin.ResourceReference()).
 						HasNameString(id).
@@ -459,7 +458,7 @@ func TestAcc_Account_IgnoreUpdateAfterCreationOnCertainFields(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(id).
@@ -479,7 +478,7 @@ func TestAcc_Account_IgnoreUpdateAfterCreationOnCertainFields(t *testing.T) {
 						plancheck.ExpectResourceAction(newConfigModel.ResourceReference(), plancheck.ResourceActionNoop),
 					},
 				},
-				Config: config.FromModel(t, newConfigModel),
+				Config: config.FromModels(t, newConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, newConfigModel.ResourceReference()).
 						HasNameString(id).
@@ -521,7 +520,7 @@ func TestAcc_Account_TryToCreateWithoutOrgadmin(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("Error: current user doesn't have the orgadmin role in session"),
 			},
 		},
@@ -557,15 +556,15 @@ func TestAcc_Account_InvalidValues(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Account),
 		Steps: []resource.TestStep{
 			{
-				Config:      config.FromModel(t, configModelInvalidUserType),
+				Config:      config.FromModels(t, configModelInvalidUserType),
 				ExpectError: regexp.MustCompile("invalid user type: invalid_user_type"),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidAccountEdition),
+				Config:      config.FromModels(t, configModelInvalidAccountEdition),
 				ExpectError: regexp.MustCompile("unknown account edition: invalid_account_edition"),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidGracePeriodInDays),
+				Config:      config.FromModels(t, configModelInvalidGracePeriodInDays),
 				ExpectError: regexp.MustCompile(`Error: expected grace_period_in_days to be at least \(3\), got 2`),
 			},
 		},
@@ -612,7 +611,7 @@ func TestAcc_Account_UpgradeFrom_v0_99_0(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.AccountResource(t, configModel.ResourceReference()).
 						HasNameString(name).
diff --git a/pkg/resources/account_parameter_acceptance_test.go b/pkg/resources/account_parameter_acceptance_test.go
index ab20439532..621b8103a9 100644
--- a/pkg/resources/account_parameter_acceptance_test.go
+++ b/pkg/resources/account_parameter_acceptance_test.go
@@ -4,12 +4,12 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
@@ -25,7 +25,7 @@ func TestAcc_AccountParameter(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterAllowIDToken),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterAllowIDToken)).
 					HasValueString("true"),
@@ -46,7 +46,7 @@ func TestAcc_AccountParameter_PREVENT_LOAD_FROM_INLINE_URL(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterPreventLoadFromInlineURL),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterPreventLoadFromInlineURL)).
 					HasValueString("true"),
@@ -67,7 +67,7 @@ func TestAcc_AccountParameter_REQUIRE_STORAGE_INTEGRATION_FOR_STAGE_CREATION(t *
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterRequireStorageIntegrationForStageCreation),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterRequireStorageIntegrationForStageCreation)).
 					HasValueString("true"),
@@ -88,7 +88,7 @@ func TestAcc_AccountParameter_Issue2573(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterTimezone),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterTimezone)).
 					HasValueString("Etc/UTC"),
@@ -115,7 +115,7 @@ func TestAcc_AccountParameter_Issue3025(t *testing.T) {
 		CheckDestroy: acc.CheckAccountParameterUnset(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.AccountParameterResource(t, model.ResourceReference()).
 					HasKeyString(string(sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList)).
 					HasValueString("true"),
diff --git a/pkg/resources/database_role_acceptance_test.go b/pkg/resources/database_role_acceptance_test.go
index 45ab1ddeac..879343352f 100644
--- a/pkg/resources/database_role_acceptance_test.go
+++ b/pkg/resources/database_role_acceptance_test.go
@@ -4,21 +4,19 @@ import (
 	"fmt"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -38,7 +36,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.DatabaseRole),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, databaseRoleModel),
+				Config: config.FromModels(t, databaseRoleModel),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -67,7 +65,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, databaseRoleModelWithComment),
+				Config: config.FromModels(t, databaseRoleModelWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -96,7 +94,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, databaseRoleModel),
+				Config: config.FromModels(t, databaseRoleModel),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(id.Name()).
@@ -130,7 +128,7 @@ func TestAcc_DatabaseRole(t *testing.T) {
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, databaseRoleModel.WithName(newId.Name())),
+				Config: config.FromModels(t, databaseRoleModel.WithName(newId.Name())),
 				Check: assert.AssertThat(t,
 					resourceassert.DatabaseRoleResource(t, "snowflake_database_role.test").
 						HasNameString(newId.Name()).
@@ -168,7 +166,7 @@ func TestAcc_DatabaseRole_migrateFromV0941_ensureSmoothUpgradeWithNewResourceId(
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, databaseRoleModelWithComment),
+				Config: config.FromModels(t, databaseRoleModelWithComment),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "id", fmt.Sprintf(`%s|%s`, id.DatabaseName(), id.Name())),
 				),
@@ -176,7 +174,7 @@ func TestAcc_DatabaseRole_migrateFromV0941_ensureSmoothUpgradeWithNewResourceId(
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, databaseRoleModelWithComment),
+				Config:                   config.FromModels(t, databaseRoleModelWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionNoop),
@@ -214,7 +212,7 @@ func TestAcc_DatabaseRole_IdentifierQuotingDiffSuppression(t *testing.T) {
 					},
 				},
 				ExpectNonEmptyPlan: true,
-				Config:             config.FromModel(t, databaseRoleModelWithComment),
+				Config:             config.FromModels(t, databaseRoleModelWithComment),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "database", id.DatabaseName()),
 					resource.TestCheckResourceAttr("snowflake_database_role.test", "name", id.Name()),
@@ -224,7 +222,7 @@ func TestAcc_DatabaseRole_IdentifierQuotingDiffSuppression(t *testing.T) {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, databaseRoleModelWithComment),
+				Config:                   config.FromModels(t, databaseRoleModelWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_database_role.test", plancheck.ResourceActionNoop),
diff --git a/pkg/resources/function_javascript_acceptance_test.go b/pkg/resources/function_javascript_acceptance_test.go
index 71028f1d1b..5c87a1d047 100644
--- a/pkg/resources/function_javascript_acceptance_test.go
+++ b/pkg/resources/function_javascript_acceptance_test.go
@@ -4,20 +4,20 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testdatatypes"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk/datatypes"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
diff --git a/pkg/resources/function_python_acceptance_test.go b/pkg/resources/function_python_acceptance_test.go
index 487083c2c1..24bee831dd 100644
--- a/pkg/resources/function_python_acceptance_test.go
+++ b/pkg/resources/function_python_acceptance_test.go
@@ -5,7 +5,6 @@ import (
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
@@ -19,6 +18,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
diff --git a/pkg/resources/legacy_service_user_acceptance_test.go b/pkg/resources/legacy_service_user_acceptance_test.go
index 55c0033448..1931d4a1dc 100644
--- a/pkg/resources/legacy_service_user_acceptance_test.go
+++ b/pkg/resources/legacy_service_user_acceptance_test.go
@@ -56,8 +56,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.LegacyServiceUserModel {
@@ -74,8 +74,8 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment)
 	}
 
@@ -89,7 +89,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -116,7 +116,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -143,12 +143,12 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -172,7 +172,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -211,7 +211,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -220,7 +220,7 @@ func TestAcc_LegacyServiceUser_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.LegacyServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -327,7 +327,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -347,7 +347,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -537,7 +537,7 @@ func TestAcc_LegacyServiceUser_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -564,7 +564,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.LegacyServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString("LEGACY_SERVICE"),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType("LEGACY_SERVICE"),
@@ -575,7 +575,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypeService)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypeService))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -591,7 +591,7 @@ func TestAcc_LegacyServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go b/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
index a6ffa8205b..b5f8f06687 100644
--- a/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
+++ b/pkg/resources/oauth_integration_for_custom_clients_acceptance_test.go
@@ -6,24 +6,22 @@ import (
 	"strings"
 	"testing"
 
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-
+	resourcenames "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	tfjson "github.com/hashicorp/terraform-json"
 
-	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
-	resourcenames "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -791,7 +789,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -801,7 +799,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
@@ -814,7 +812,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 					// Do not revert, because the revert is setup above.
 					acc.TestClient().Parameter.UpdateAccountParameterTemporarily(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList, "false")
 				},
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -824,7 +822,7 @@ func TestAcc_OauthIntegrationForCustomClients_WithPrivilegedRolesBlockedList(t *
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
diff --git a/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go b/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
index 975b47b7b7..cc251e8f86 100644
--- a/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
+++ b/pkg/resources/oauth_integration_for_partner_applications_acceptance_test.go
@@ -6,24 +6,21 @@ import (
 	"strings"
 	"testing"
 
-	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	accconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
+	resourcehelpers "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	tfjson "github.com/hashicorp/terraform-json"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
-
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -798,7 +795,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -808,7 +805,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
@@ -821,7 +818,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 					// Do not revert, because the revert is setup above.
 					acc.TestClient().Parameter.UpdateAccountParameterTemporarily(t, sdk.AccountParameterOAuthAddPrivilegedRolesToBlockedList, "false")
 				},
-				Config: accconfig.FromModel(t, modelWithBlockedRole),
+				Config: accconfig.FromModels(t, modelWithBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.#", "1"),
 					resource.TestCheckTypeSetElemAttr(modelWithBlockedRole.ResourceReference(), "blocked_roles_list.*", role.ID().Name()),
@@ -831,7 +828,7 @@ func TestAcc_OauthIntegrationForPartnerApplications_WithPrivilegedRolesBlockedLi
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, modelWithoutBlockedRole),
+				Config: accconfig.FromModels(t, modelWithoutBlockedRole),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "blocked_roles_list.#", "0"),
 					resource.TestCheckResourceAttr(modelWithoutBlockedRole.ResourceReference(), "name", id.Name()),
diff --git a/pkg/resources/object_renaming_acceptance_test.go b/pkg/resources/object_renaming_acceptance_test.go
index 15be4da721..afdbe48536 100644
--- a/pkg/resources/object_renaming_acceptance_test.go
+++ b/pkg/resources/object_renaming_acceptance_test.go
@@ -8,6 +8,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
@@ -197,13 +198,13 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedInternally(t *testing.T) {
 				CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 				Steps: []resource.TestStep{
 					{
-						Config: config.FromModel(t, databaseConfigModel) + configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.Dependency, databaseId.Name(), schemaName),
+						Config: config.FromModels(t, databaseConfigModel) + configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.Dependency, databaseId.Name(), schemaName),
 					},
 					{
 						ConfigPlanChecks: resource.ConfigPlanChecks{
 							PreApply: preApplyChecksAfterRename,
 						},
-						Config: config.FromModel(t, databaseConfigModelWithNewId) + schemaConfigAfterRename,
+						Config: config.FromModels(t, databaseConfigModelWithNewId) + schemaConfigAfterRename,
 					},
 				},
 			})
@@ -249,9 +250,9 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally(t *testing.T) {
 			var schemaConfigAfterRename string
 
 			if testCase.IsRenamedDatabaseReferencedAfterRenameInDatabase {
-				databaseConfigAfterRename = config.FromModel(t, databaseConfigModelWithNewId)
+				databaseConfigAfterRename = config.FromModels(t, databaseConfigModelWithNewId)
 			} else {
-				databaseConfigAfterRename = config.FromModel(t, databaseConfigModel)
+				databaseConfigAfterRename = config.FromModels(t, databaseConfigModel)
 			}
 
 			switch testCase.Dependency {
@@ -273,7 +274,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally(t *testing.T) {
 				CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 				Steps: []resource.TestStep{
 					{
-						Config: config.FromModel(t, databaseConfigModel) + configSchemaWithDatabaseReference(databaseConfigModel.ResourceReference(), schemaName),
+						Config: config.FromModels(t, databaseConfigModel) + configSchemaWithDatabaseReference(databaseConfigModel.ResourceReference(), schemaName),
 					},
 					{
 						PreConfig: func() {
@@ -318,7 +319,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 		CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModelsDeprecated(t, databaseConfigModel, schemaModelConfig),
+				Config: config.FromModels(t, databaseConfigModel, schemaModelConfig),
 			},
 			{
 				// This step has inconsistent results, and it depends on the Terraform execution order which seems to be non-deterministic in this case
@@ -333,7 +334,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 						plancheck.ExpectResourceAction("snowflake_schema.test", plancheck.ResourceActionCreate),
 					},
 				},
-				Config: config.FromModelsDeprecated(t, databaseConfigModel, schemaModelConfig),
+				Config: config.FromModels(t, databaseConfigModel, schemaModelConfig),
 				// ExpectError: regexp.MustCompile("does not exist or not authorized"),
 			},
 		},
@@ -362,7 +363,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 		CheckDestroy: acc.CheckDestroy(t, resources.Schema),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModelsDeprecated(t, schemaModelConfig, databaseConfigModel),
+				Config: config.FromModels(t, schemaModelConfig, databaseConfigModel),
 			},
 			{
 				PreConfig: func() {
@@ -376,7 +377,7 @@ func TestAcc_ShallowHierarchy_IsInConfig_RenamedExternally_WithoutDependency_Aft
 						plancheck.ExpectResourceAction("snowflake_schema.test", plancheck.ResourceActionCreate),
 					},
 				},
-				Config:      config.FromModelsDeprecated(t, schemaModelConfig, databaseConfigModel),
+				Config:      config.FromModels(t, schemaModelConfig, databaseConfigModel),
 				ExpectError: regexp.MustCompile("does not exist or not authorized"),
 			},
 		},
@@ -422,7 +423,7 @@ func TestAcc_ShallowHierarchy_IsNotInConfig_RenamedExternally(t *testing.T) {
 							_, databaseCleanup := acc.TestClient().Database.CreateDatabaseWithIdentifier(t, databaseId)
 							t.Cleanup(databaseCleanup)
 						},
-						Config: config.FromModel(t, schemaModelConfig),
+						Config: config.FromModels(t, schemaModelConfig),
 					},
 					{
 						PreConfig: func() {
@@ -496,7 +497,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedInternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -513,7 +514,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedInternally(t *testing.T) {
 								plancheck.ExpectResourceAction("snowflake_table.test", plancheck.ResourceActionDestroyBeforeCreate),
 							},
 						},
-						Config: config.FromModel(t, databaseConfigModelWithNewId) +
+						Config: config.FromModels(t, databaseConfigModelWithNewId) +
 							configSchemaWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseInSchemaDependency, newDatabaseId.Name(), schemaName) +
 							configTableWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, newDatabaseId.Name(), schemaName, tableName),
 					},
@@ -566,7 +567,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedInternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), ImplicitDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -583,7 +584,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedInternally(t *testing.T) {
 								plancheck.ExpectResourceAction("snowflake_table.test", plancheck.ResourceActionDestroyBeforeCreate),
 							},
 						},
-						Config: config.FromModel(t, databaseConfigModel) +
+						Config: config.FromModels(t, databaseConfigModel) +
 							configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), ImplicitDependency, databaseId.Name(), newSchemaName) +
 							configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), newSchemaName, tableName),
 					},
@@ -639,7 +640,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedExternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -653,7 +654,7 @@ func TestAcc_DeepHierarchy_AreInConfig_DatabaseRenamedExternally(t *testing.T) {
 							NewName: &newDatabaseId,
 						})
 					},
-					Config: config.FromModel(t, databaseConfigModelWithNewId) +
+					Config: config.FromModels(t, databaseConfigModelWithNewId) +
 						configSchemaWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseInSchemaDependency, newDatabaseId.Name(), schemaName) +
 						configTableWithReferences(t, databaseConfigModelWithNewId.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, newDatabaseId.Name(), schemaName, tableName),
 					ExpectError: testCase.ExpectedSecondStepError,
@@ -709,7 +710,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedExternally(t *testing.T) {
 
 			testSteps := []resource.TestStep{
 				{
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), schemaId.Name()) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), schemaId.Name(), tableName),
 					ExpectError: testCase.ExpectedFirstStepError,
@@ -723,7 +724,7 @@ func TestAcc_DeepHierarchy_AreInConfig_SchemaRenamedExternally(t *testing.T) {
 							NewName: &newSchemaId,
 						})
 					},
-					Config: config.FromModel(t, databaseConfigModel) +
+					Config: config.FromModels(t, databaseConfigModel) +
 						configSchemaWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseInSchemaDependency, databaseId.Name(), newSchemaId.Name()) +
 						configTableWithReferences(t, databaseConfigModel.ResourceReference(), testCase.DatabaseDependency, "snowflake_schema.test", testCase.SchemaDependency, databaseId.Name(), newSchemaId.Name(), tableName),
 					ExpectError: testCase.ExpectedSecondStepError,
diff --git a/pkg/resources/primary_connection_acceptance_test.go b/pkg/resources/primary_connection_acceptance_test.go
index 8c2241a328..d1f6dc274d 100644
--- a/pkg/resources/primary_connection_acceptance_test.go
+++ b/pkg/resources/primary_connection_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -17,7 +19,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -51,7 +52,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -78,7 +79,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, connectionModelWithComment),
+				Config: config.FromModels(t, connectionModelWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModelWithComment.ResourceReference()).
@@ -104,7 +105,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -117,7 +118,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// enable failover to second account
 			{
-				Config: config.FromModel(t, connectionModelWithFailover),
+				Config: config.FromModels(t, connectionModelWithFailover),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModelWithFailover.ResourceReference()).
@@ -133,7 +134,7 @@ func TestAcc_PrimaryConnection_Basic(t *testing.T) {
 			},
 			// disable failover to second account
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -176,7 +177,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.PrimaryConnectionResource(t, connectionModel.ResourceReference()).
@@ -205,7 +206,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 						WithSet(*sdk.NewConnectionSetRequest().
 							WithComment("external comment")))
 				},
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -229,7 +230,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 							[]sdk.AccountIdentifier{secondaryAccountId})),
 					)
 				},
-				Config: config.FromModel(t, connectionModel),
+				Config: config.FromModels(t, connectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -256,7 +257,7 @@ func TestAcc_PrimaryConnection_ExternalChanges(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Connection.Alter(t, sdk.NewAlterConnectionRequest(id).WithDisableConnectionFailover(*sdk.NewDisableConnectionFailoverRequest()))
 				},
-				Config: config.FromModel(t, connectionModelWithFailover),
+				Config: config.FromModels(t, connectionModelWithFailover),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(connectionModelWithFailover.ResourceReference(), plancheck.ResourceActionUpdate),
diff --git a/pkg/resources/resource_monitor_acceptance_test.go b/pkg/resources/resource_monitor_acceptance_test.go
index 742d1ecafb..5844d1a56f 100644
--- a/pkg/resources/resource_monitor_acceptance_test.go
+++ b/pkg/resources/resource_monitor_acceptance_test.go
@@ -37,7 +37,7 @@ func TestAcc_ResourceMonitor_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -111,7 +111,7 @@ func TestAcc_ResourceMonitor_Complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -146,7 +146,7 @@ func TestAcc_ResourceMonitor_Complete(t *testing.T) {
 			{
 				ResourceName: "snowflake_resource_monitor.test",
 				ImportState:  true,
-				Config:       config.FromModel(t, configModel),
+				Config:       config.FromModels(t, configModel),
 				ImportStateCheck: assert.AssertThatImport(t,
 					resourceassert.ImportedResourceMonitorResource(t, helpers.EncodeResourceIdentifier(id)).
 						HasNameString(id.Name()).
@@ -211,7 +211,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModelNothingSet),
+				Config: config.FromModels(t, configModelNothingSet),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -242,7 +242,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Set
 			{
-				Config: config.FromModel(t, configModelEverythingSet),
+				Config: config.FromModels(t, configModelEverythingSet),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -276,7 +276,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Update
 			{
-				Config: config.FromModel(t, configModelUpdated),
+				Config: config.FromModels(t, configModelUpdated),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -311,7 +311,7 @@ func TestAcc_ResourceMonitor_Updates(t *testing.T) {
 			},
 			// Unset
 			{
-				Config: config.FromModel(t, configModelEverythingUnset),
+				Config: config.FromModels(t, configModelEverythingUnset),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
 						HasNameString(id.Name()).
@@ -382,7 +382,7 @@ func TestAcc_ResourceMonitor_ExternalChanges(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModelEverythingSet),
+				Config: config.FromModels(t, configModelEverythingSet),
 			},
 			// Update externally, but match the updated configuration (expected updates to the same values)
 			{
@@ -426,7 +426,7 @@ func TestAcc_ResourceMonitor_ExternalChanges(t *testing.T) {
 						planchecks.PrintPlanDetails(configModelUpdated.ResourceReference(), "credit_quota", "end_timestamp", "frequency", "fully_qualified_name", "name", "notify_triggers", "notify_users", "start_timestamp", "suspend_immediate_trigger", "suspend_trigger", r.ShowOutputAttributeName),
 					},
 				},
-				Config: config.FromModel(t, configModelUpdated),
+				Config: config.FromModels(t, configModelUpdated),
 			},
 		},
 	})
@@ -454,10 +454,10 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			{
-				Config:      config.FromModel(t, configModelInvalidUpdate),
+				Config:      config.FromModels(t, configModelInvalidUpdate),
 				ExpectError: regexp.MustCompile("Invalid date/time format string"),
 				Check: assert.AssertThat(t,
 					resourceassert.ResourceMonitorResource(t, "snowflake_resource_monitor.test").
@@ -468,7 +468,7 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 			// The following was printed (indicating the invalid value was saved into the state):
 			// ComputedIfAnyAttributeChanged: changed key: end_timestamp old: 2024-11-19 10:11abc new: 2024-11-09 10:11
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -488,7 +488,7 @@ func TestAcc_ResourceMonitor_PartialUpdate(t *testing.T) {
 // It can be fixed with them.
 func TestAcc_ResourceMonitor_issue2167(t *testing.T) {
 	id := acc.TestClient().Ids.RandomAccountObjectIdentifier()
-	configNoUsers := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(configvariable.SetVariable())
+	configNoUsers := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(config.EmptyListVariable())
 	configWithNonExistingUser := model.ResourceMonitor("test", id.Name()).WithNotifyUsersValue(configvariable.SetVariable(configvariable.StringVariable("non_existing_user")))
 
 	resource.Test(t, resource.TestCase{
@@ -500,13 +500,13 @@ func TestAcc_ResourceMonitor_issue2167(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ResourceMonitor),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configNoUsers),
+				Config: config.FromModels(t, configNoUsers),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_resource_monitor.test", "name", id.Name()),
 				),
 			},
 			{
-				Config:      config.FromModel(t, configWithNonExistingUser),
+				Config:      config.FromModels(t, configWithNonExistingUser),
 				ExpectError: regexp.MustCompile(`.*090268 \(22023\): User non_existing_user does not exist.*`),
 			},
 		},
@@ -534,7 +534,7 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			// Same configuration, but we drop resource monitor externally
 			{
@@ -547,7 +547,7 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 				PreConfig: func() {
 					acc.TestClient().ResourceMonitor.DropResourceMonitorFunc(t, id)()
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("object does not exist or not authorized"),
 			},
 			// Same configuration, but it's the last version where it's still not working
@@ -558,14 +558,14 @@ func TestAcc_ResourceMonitor_Issue1990_RemovingResourceMonitorOutsideOfTerraform
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("object does not exist or not authorized"),
 			},
 			// Same configuration, but it's the latest version of the provider (0.96.0 and above)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 			},
 		},
 	})
@@ -606,7 +606,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 (produces a plan because of the format difference)
 			{
@@ -616,7 +616,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:             config.FromModel(t, configModelWithDateStartTimestamp),
+				Config:             config.FromModels(t, configModelWithDateStartTimestamp),
 				ExpectNonEmptyPlan: true,
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 15:04 (won't produce plan because of the internal format mapping to this exact format)
@@ -627,7 +627,7 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithDateTimeFormat),
+				Config: config.FromModels(t, configModelWithDateTimeFormat),
 			},
 			// Destroy the resource
 			{
@@ -637,24 +637,24 @@ func TestAcc_ResourceMonitor_Issue_TimestampInfinitePlan(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:  config.FromModel(t, configModelWithDateTimeFormat),
+				Config:  config.FromModels(t, configModelWithDateTimeFormat),
 				Destroy: true,
 			},
 			// Create resource monitor without the timestamps
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 (no plan produced)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithDateStartTimestamp),
+				Config:                   config.FromModels(t, configModelWithDateStartTimestamp),
 			},
 			// Alter resource timestamps to have the following format: 2006-01-02 15:04 (no plan produced and the internal mapping is not applied in this version)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithDateTimeFormat),
+				Config:                   config.FromModels(t, configModelWithDateTimeFormat),
 			},
 		},
 	})
@@ -687,14 +687,14 @@ func TestAcc_ResourceMonitor_Issue1500_CreatingWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config:      config.FromModel(t, configModel),
+				Config:      config.FromModels(t, configModel),
 				ExpectError: regexp.MustCompile("SQL compilation error"),
 			},
 			// Create resource monitor with only triggers (the latest version)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				ExpectError:              regexp.MustCompile("due to Snowflake limiltations you cannot create Resource Monitor with only triggers set"),
 			},
 		},
@@ -741,7 +741,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithCreditQuota),
+				Config: config.FromModels(t, configModelWithCreditQuota),
 			},
 			// Update only triggers (not allowed in Snowflake)
 			{
@@ -751,7 +751,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithUpdatedTriggers),
+				Config: config.FromModels(t, configModelWithUpdatedTriggers),
 				// For some reason, not returning error (SQL compilation error should be returned in this case; most likely update was handled incorrectly, or it was handled similarly as in the current version)
 			},
 			// Remove all triggers (not allowed in Snowflake)
@@ -762,7 +762,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, configModelWithoutTriggers),
+				Config: config.FromModels(t, configModelWithoutTriggers),
 				// For some reason, not returning the correct error (SQL compilation error should be returned in this case; most likely update was processed incorrectly)
 				ExpectError: regexp.MustCompile(`at least one of AlterResourceMonitorOptions fields \[Set Triggers] must be set`),
 			},
@@ -770,12 +770,12 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithCreditQuota),
+				Config:                   config.FromModels(t, configModelWithCreditQuota),
 			},
 			// Update only triggers (not allowed in Snowflake)
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithUpdatedTriggers),
+				Config:                   config.FromModels(t, configModelWithUpdatedTriggers),
 			},
 			// Update only triggers (not allowed in Snowflake; recreating)
 			{
@@ -785,7 +785,7 @@ func TestAcc_ResourceMonitor_Issue1500_AlteringWithOnlyTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 		},
 	})
@@ -831,7 +831,7 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 			// Config with all triggers
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithAllTriggers),
+				Config:                   config.FromModels(t, configModelWithAllTriggers),
 			},
 			// No triggers (force new expected)
 			{
@@ -841,12 +841,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only notify triggers
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithNotifyTriggers),
+				Config:                   config.FromModels(t, configModelWithNotifyTriggers),
 			},
 			// No triggers (force new expected)
 			{
@@ -856,12 +856,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only suspend trigger
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithSuspendTrigger),
+				Config:                   config.FromModels(t, configModelWithSuspendTrigger),
 			},
 			// No triggers (force new expected)
 			{
@@ -871,12 +871,12 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 			// Config with only suspend immediate trigger
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithSuspendImmediateTrigger),
+				Config:                   config.FromModels(t, configModelWithSuspendImmediateTrigger),
 			},
 			// No triggers (force new expected)
 			{
@@ -886,7 +886,7 @@ func TestAcc_ResourceMonitor_RemovingAllTriggers(t *testing.T) {
 					},
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModelWithoutTriggers),
+				Config:                   config.FromModels(t, configModelWithoutTriggers),
 			},
 		},
 	})
diff --git a/pkg/resources/secondary_connection_acceptance_test.go b/pkg/resources/secondary_connection_acceptance_test.go
index 380f3b49b5..8de71850b5 100644
--- a/pkg/resources/secondary_connection_acceptance_test.go
+++ b/pkg/resources/secondary_connection_acceptance_test.go
@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -48,7 +49,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.SecondaryConnection),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModel.ResourceReference()).
@@ -76,7 +77,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 			},
 			// set comment
 			{
-				Config: config.FromModel(t, secondartyConnectionModelWithComment),
+				Config: config.FromModels(t, secondartyConnectionModelWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModelWithComment.ResourceReference()).
@@ -101,7 +102,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecondaryConnectionResource(t, secondartyConnectionModel.ResourceReference()).
@@ -117,7 +118,7 @@ func TestAcc_SecondaryConnection_Basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Connection.Alter(t, sdk.NewAlterConnectionRequest(id).WithPrimary(true))
 				},
-				Config: config.FromModel(t, secondartyConnectionModel),
+				Config: config.FromModels(t, secondartyConnectionModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secondartyConnectionModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_basic_authentication_acceptance_test.go b/pkg/resources/secret_with_basic_authentication_acceptance_test.go
index 3e3b09de19..ae9b1a96f2 100644
--- a/pkg/resources/secret_with_basic_authentication_acceptance_test.go
+++ b/pkg/resources/secret_with_basic_authentication_acceptance_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -43,7 +44,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
@@ -78,7 +79,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// set username, password and comment
 			{
-				Config: config.FromModel(t, secretModelDifferentCredentialsWithComment),
+				Config: config.FromModels(t, secretModelDifferentCredentialsWithComment),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 
@@ -123,7 +124,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 						planchecks.ExpectChange(secretName, "username", tfjson.ActionUpdate, sdk.String("test_username"), sdk.String("bar")),
 					},
 				},
-				Config: config.FromModel(t, secretModelDifferentCredentialsWithComment),
+				Config: config.FromModels(t, secretModelDifferentCredentialsWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
 						HasNameString(name).
@@ -150,7 +151,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelWithoutComment),
+				Config: config.FromModels(t, secretModelWithoutComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -178,7 +179,7 @@ func TestAcc_SecretWithBasicAuthentication_BasicFlow(t *testing.T) {
 			},
 			// set empty username and password
 			{
-				Config: config.FromModel(t, secretModelEmptyCredentials),
+				Config: config.FromModels(t, secretModelEmptyCredentials),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretName).
@@ -209,7 +210,7 @@ func TestAcc_SecretWithBasicAuthentication_CreateWithEmptyCredentials(t *testing
 		CheckDestroy: acc.CheckDestroy(t, resources.SecretWithBasicAuthentication),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secretModelEmptyCredentials),
+				Config: config.FromModels(t, secretModelEmptyCredentials),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretModelEmptyCredentials.ResourceReference()).
@@ -241,7 +242,7 @@ func TestAcc_SecretWithBasicAuthentication_ExternalSecretTypeChange(t *testing.T
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithBasicAuthenticationResource(t, secretModel.ResourceReference()).
@@ -258,7 +259,7 @@ func TestAcc_SecretWithBasicAuthentication_ExternalSecretTypeChange(t *testing.T
 					_, cleanup := acc.TestClient().Secret.CreateWithGenericString(t, id, "test_secret_string")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_generic_string_acceptance_test.go b/pkg/resources/secret_with_generic_string_acceptance_test.go
index 8f57a8924d..ceee85e943 100644
--- a/pkg/resources/secret_with_generic_string_acceptance_test.go
+++ b/pkg/resources/secret_with_generic_string_acceptance_test.go
@@ -4,6 +4,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -41,7 +42,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModel.ResourceReference()).
@@ -75,7 +76,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// set secret_string and comment
 			{
-				Config: config.FromModel(t, secretModel.
+				Config: config.FromModels(t, secretModel.
 					WithSecretString("bar").
 					WithComment(comment),
 				),
@@ -106,7 +107,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 						),
 					)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -138,7 +139,7 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelEmptySecretString),
+				Config: config.FromModels(t, secretModelEmptySecretString),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -165,12 +166,12 @@ func TestAcc_SecretWithGenericString_BasicFlow(t *testing.T) {
 			},
 			// destroy
 			{
-				Config:  config.FromModel(t, secretModel),
+				Config:  config.FromModels(t, secretModel),
 				Destroy: true,
 			},
 			// create with empty secret_string
 			{
-				Config: config.FromModel(t, secretModelEmptySecretString),
+				Config: config.FromModels(t, secretModelEmptySecretString),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModelEmptySecretString.ResourceReference()).
@@ -201,7 +202,7 @@ func TestAcc_SecretWithGenericString_ExternalSecretTypeChange(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithGenericStringResource(t, secretModel.ResourceReference()).
@@ -218,7 +219,7 @@ func TestAcc_SecretWithGenericString_ExternalSecretTypeChange(t *testing.T) {
 					_, cleanup := acc.TestClient().Secret.CreateWithBasicAuthenticationFlow(t, id, "test_pswd", "test_usr")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go b/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
index 82d8c163aa..93c74fa2fb 100644
--- a/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
+++ b/pkg/resources/secret_with_oauth_authorization_code_grant_acceptance_test.go
@@ -6,6 +6,9 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,9 +18,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -53,7 +54,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -89,7 +90,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 			},
 			// set all
 			{
-				Config: config.FromModel(t, secretModelAllSet),
+				Config: config.FromModels(t, secretModelAllSet),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -128,7 +129,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_BasicFlow(t *testing.T) {
 						),
 					))
 				},
-				Config: config.FromModel(t, secretModelAllSet),
+				Config: config.FromModels(t, secretModelAllSet),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -200,7 +201,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 		Steps: []resource.TestStep{
 			// create with DateOnly
 			{
-				Config: config.FromModel(t, secretModelDateOnly),
+				Config: config.FromModels(t, secretModelDateOnly),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelDateOnly.ResourceReference()).
@@ -211,7 +212,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime without seconds
 			{
-				Config: config.FromModel(t, secretModelWithoutSeconds),
+				Config: config.FromModels(t, secretModelWithoutSeconds),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelWithoutSeconds.ResourceReference()).
@@ -222,7 +223,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime
 			{
-				Config: config.FromModel(t, secretModelDateTime),
+				Config: config.FromModels(t, secretModelDateTime),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelDateTime.ResourceReference()).
@@ -233,7 +234,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_DifferentTimeFormats(t *testing.T)
 			},
 			// update with DateTime with PDT timezone
 			{
-				Config: config.FromModel(t, secretModelWithPDT),
+				Config: config.FromModels(t, secretModelWithPDT),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModelWithPDT.ResourceReference()).
@@ -272,7 +273,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalRefreshTokenExpiryTimeChan
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -305,7 +306,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalRefreshTokenExpiryTimeChan
 						),
 					)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -346,7 +347,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChange(t *testin
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -363,7 +364,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChange(t *testin
 					_, cleanup := acc.TestClient().Secret.CreateWithBasicAuthenticationFlow(t, id, "test_pswd", "test_usr")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -405,7 +406,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChangeToOAuthCli
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithAuthorizationCodeGrantResource(t, secretModel.ResourceReference()).
@@ -424,7 +425,7 @@ func TestAcc_SecretWithAuthorizationCodeGrant_ExternalSecretTypeChangeToOAuthCli
 					_, cleanup := acc.TestClient().Secret.CreateWithOAuthClientCredentialsFlow(t, id, integrationId, []sdk.ApiIntegrationScope{})
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go b/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
index 69a46330f2..37154edecd 100644
--- a/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
+++ b/pkg/resources/secret_with_oauth_client_credentials_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"time"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfjson "github.com/hashicorp/terraform-json"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -16,7 +18,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -51,7 +52,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.SecretWithClientCredentials),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -88,7 +89,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// set oauth_scopes and comment in config
 			{
-				Config: config.FromModel(t, secretModelTestInScopes),
+				Config: config.FromModels(t, secretModelTestInScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretName, plancheck.ResourceActionUpdate),
@@ -131,7 +132,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 					)
 					acc.TestClient().Secret.Alter(t, req)
 				},
-				Config: config.FromModel(t, secretModelFooInScopesWithComment),
+				Config: config.FromModels(t, secretModelFooInScopesWithComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -153,7 +154,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// unset comment
 			{
-				Config: config.FromModel(t, secretModelFooInScopes),
+				Config: config.FromModels(t, secretModelFooInScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModelFooInScopes.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -171,7 +172,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 					req := sdk.NewAlterSecretRequest(id).WithSet(*sdk.NewSecretSetRequest().WithComment(comment))
 					acc.TestClient().Secret.Alter(t, req)
 				},
-				Config: config.FromModel(t, secretModelWithoutComment),
+				Config: config.FromModels(t, secretModelWithoutComment),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -185,7 +186,7 @@ func TestAcc_SecretWithClientCredentials_BasicFlow(t *testing.T) {
 			},
 			// create without comment
 			{
-				Config: config.FromModel(t, secretModelWithoutComment.WithOauthScopes([]string{"foo", "bar"})),
+				Config: config.FromModels(t, secretModelWithoutComment.WithOauthScopes([]string{"foo", "bar"})),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, "snowflake_secret_with_client_credentials.s").
@@ -243,7 +244,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create secret without providing oauth_scopes value
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -258,7 +259,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 			},
 			// Set oauth_scopes
 			{
-				Config: config.FromModel(t, secretModel.
+				Config: config.FromModels(t, secretModel.
 					WithOauthScopes([]string{"foo"}),
 				),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
@@ -279,7 +280,7 @@ func TestAcc_SecretWithClientCredentials_EmptyScopesList(t *testing.T) {
 			},
 			// Set empty oauth_scopes
 			{
-				Config: config.FromModel(t, secretModelEmptyScopes),
+				Config: config.FromModels(t, secretModelEmptyScopes),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -322,7 +323,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChange(t *testing.T)
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -339,7 +340,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChange(t *testing.T)
 					_, cleanup := acc.TestClient().Secret.CreateWithGenericString(t, id, "test_secret_string")
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -381,7 +382,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChangeToOAuthAuthCode
 		Steps: []resource.TestStep{
 			// create
 			{
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.SecretWithClientCredentialsResource(t, secretModel.ResourceReference()).
@@ -402,7 +403,7 @@ func TestAcc_SecretWithClientCredentials_ExternalSecretTypeChangeToOAuthAuthCode
 					_, cleanup := acc.TestClient().Secret.CreateWithOAuthAuthorizationCodeFlow(t, id, integrationId, "test_refresh_token", time.Now().Add(24*time.Hour).Format(time.DateOnly))
 					t.Cleanup(cleanup)
 				},
-				Config: config.FromModel(t, secretModel),
+				Config: config.FromModels(t, secretModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(secretModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/service_user_acceptance_test.go b/pkg/resources/service_user_acceptance_test.go
index a314e774fd..319b8ab61c 100644
--- a/pkg/resources/service_user_acceptance_test.go
+++ b/pkg/resources/service_user_acceptance_test.go
@@ -51,8 +51,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 		WithDefaultNamespace("some.namespace").
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment)
 
 	userModelAllAttributesChanged := func(loginName string) *model.ServiceUserModel {
@@ -67,8 +67,8 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			WithDefaultNamespace("one_part_namespace").
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment)
 	}
 
@@ -82,7 +82,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -107,7 +107,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -133,12 +133,12 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -160,7 +160,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -197,7 +197,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -206,7 +206,7 @@ func TestAcc_ServiceUser_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -311,7 +311,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -331,7 +331,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -521,7 +521,7 @@ func TestAcc_ServiceUser_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -548,7 +548,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.ServiceUser),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.ServiceUserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString("SERVICE"),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType("SERVICE"),
@@ -559,7 +559,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypePerson)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypePerson))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -575,7 +575,7 @@ func TestAcc_ServiceUser_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_directory_table_acceptance_test.go b/pkg/resources/stream_on_directory_table_acceptance_test.go
index 0f61963f93..548c210667 100644
--- a/pkg/resources/stream_on_directory_table_acceptance_test.go
+++ b/pkg/resources/stream_on_directory_table_acceptance_test.go
@@ -6,6 +6,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -15,7 +17,6 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
@@ -54,7 +55,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel()),
+				Config: config.FromModels(t, baseModel()),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -95,7 +96,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel()),
+				Config:       config.FromModels(t, baseModel()),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -109,7 +110,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// set all fields
 			{
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -154,7 +155,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Stream.Alter(t, sdk.NewAlterStreamRequest(id).WithSetComment("bar"))
 				},
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -201,7 +202,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// update fields
 			{
-				Config: config.FromModel(t, modelWithExtraFieldsModified),
+				Config: config.FromModels(t, modelWithExtraFieldsModified),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -248,7 +249,7 @@ func TestAcc_StreamOnDirectoryTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsModified),
+				Config:       config.FromModels(t, modelWithExtraFieldsModified),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -285,7 +286,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -295,7 +296,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -307,7 +308,7 @@ func TestAcc_StreamOnDirectoryTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -350,7 +351,7 @@ func TestAcc_StreamOnDirectoryTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -358,14 +359,14 @@ func TestAcc_StreamOnDirectoryTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -429,7 +430,7 @@ func TestAcc_StreamOnDirectoryTable_RecreateWhenStale(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnDirectoryTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -454,7 +455,7 @@ func TestAcc_StreamOnDirectoryTable_InvalidConfiguration(t *testing.T) {
 		Steps: []resource.TestStep{
 			// invalid stage id
 			{
-				Config:      config.FromModel(t, modelWithInvalidStageId),
+				Config:      config.FromModels(t, modelWithInvalidStageId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -476,7 +477,7 @@ func TestAcc_StreamOnDirectoryTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnDirectoryTableResource(t, model.ResourceReference()).
@@ -496,7 +497,7 @@ func TestAcc_StreamOnDirectoryTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_external_table_acceptance_test.go b/pkg/resources/stream_on_external_table_acceptance_test.go
index f3d9feb28f..db5f2dbda8 100644
--- a/pkg/resources/stream_on_external_table_acceptance_test.go
+++ b/pkg/resources/stream_on_external_table_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -77,7 +78,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -123,7 +124,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel),
+				Config:       config.FromModels(t, baseModel),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -338,7 +339,7 @@ func TestAcc_StreamOnExternalTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsModified),
+				Config:       config.FromModels(t, modelWithExtraFieldsModified),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -381,7 +382,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -391,7 +392,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -403,7 +404,7 @@ func TestAcc_StreamOnExternalTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -456,7 +457,7 @@ func TestAcc_StreamOnExternalTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -464,14 +465,14 @@ func TestAcc_StreamOnExternalTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -521,7 +522,7 @@ func TestAcc_StreamOnExternalTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -542,7 +543,7 @@ func TestAcc_StreamOnExternalTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0, this results in a permadiff
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -601,7 +602,7 @@ func TestAcc_StreamOnExternalTable_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -636,7 +637,7 @@ func TestAcc_StreamOnExternalTable_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnExternalTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -885,7 +886,7 @@ func TestAcc_StreamOnExternalTable_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid external table id
 			{
-				Config:      config.FromModel(t, modelWithInvalidExternalTableId),
+				Config:      config.FromModels(t, modelWithInvalidExternalTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -912,7 +913,7 @@ func TestAcc_StreamOnExternalTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnExternalTableResource(t, model.ResourceReference()).
@@ -932,7 +933,7 @@ func TestAcc_StreamOnExternalTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_table_acceptance_test.go b/pkg/resources/stream_on_table_acceptance_test.go
index bc71c43560..70762c169b 100644
--- a/pkg/resources/stream_on_table_acceptance_test.go
+++ b/pkg/resources/stream_on_table_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -67,7 +68,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -109,7 +110,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel),
+				Config:       config.FromModels(t, baseModel),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -269,7 +270,7 @@ func TestAcc_StreamOnTable_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsDefaultMode),
+				Config:       config.FromModels(t, modelWithExtraFieldsDefaultMode),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -305,7 +306,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -315,7 +316,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -327,7 +328,7 @@ func TestAcc_StreamOnTable_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -372,7 +373,7 @@ func TestAcc_StreamOnTable_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -380,14 +381,14 @@ func TestAcc_StreamOnTable_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -432,7 +433,7 @@ func TestAcc_StreamOnTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -453,7 +454,7 @@ func TestAcc_StreamOnTable_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -507,7 +508,7 @@ func TestAcc_StreamOnTable_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -543,7 +544,7 @@ func TestAcc_StreamOnTable_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnTableResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -830,7 +831,7 @@ func TestAcc_StreamOnTable_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid table id
 			{
-				Config:      config.FromModel(t, modelWithInvalidTableId),
+				Config:      config.FromModels(t, modelWithInvalidTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -853,7 +854,7 @@ func TestAcc_StreamOnTable_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnTableResource(t, model.ResourceReference()).
@@ -874,7 +875,7 @@ func TestAcc_StreamOnTable_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeView, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/stream_on_view_acceptance_test.go b/pkg/resources/stream_on_view_acceptance_test.go
index 279fdb1371..791b9a34c2 100644
--- a/pkg/resources/stream_on_view_acceptance_test.go
+++ b/pkg/resources/stream_on_view_acceptance_test.go
@@ -6,22 +6,23 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
+	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	tfjson "github.com/hashicorp/terraform-json"
+	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
-	tfconfig "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfjson "github.com/hashicorp/terraform-json"
-	pluginconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -72,7 +73,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// without optionals
 			{
-				Config: config.FromModel(t, baseModel()),
+				Config: config.FromModels(t, baseModel()),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -114,7 +115,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:       config.FromModel(t, baseModel()),
+				Config:       config.FromModels(t, baseModel()),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -274,7 +275,7 @@ func TestAcc_StreamOnView_Basic(t *testing.T) {
 			},
 			// import
 			{
-				Config:       config.FromModel(t, modelWithExtraFieldsDefaultMode),
+				Config:       config.FromModels(t, modelWithExtraFieldsDefaultMode),
 				ResourceName: resourceName,
 				ImportState:  true,
 				ImportStateCheck: assert.AssertThatImport(t,
@@ -314,7 +315,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnView),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -324,7 +325,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(true)),
+				Config: config.FromModels(t, model.WithCopyGrants(true)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -336,7 +337,7 @@ func TestAcc_StreamOnView_CopyGrants(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model.WithCopyGrants(false)),
+				Config: config.FromModels(t, model.WithCopyGrants(false)),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()),
 					assert.Check(resource.TestCheckResourceAttrWith(resourceName, "show_output.0.created_on", func(value string) error {
@@ -384,7 +385,7 @@ func TestAcc_StreamOnView_CheckGrantsAfterRecreation(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnExternalTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model1) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					// there should be more than one privilege, because we applied grant all privileges and initially there's always one which is ownership
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
@@ -392,14 +393,14 @@ func TestAcc_StreamOnView_CheckGrantsAfterRecreation(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config: config.FromModels(t, model2) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.#", "2"),
 					resource.TestCheckResourceAttr("data.snowflake_grants.grants", "grants.1.privilege", "SELECT"),
 				),
 			},
 			{
-				Config:             config.FromModel(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
+				Config:             config.FromModels(t, model1WithoutCopyGrants) + grantStreamPrivilegesConfig(resourceName, role.ID()),
 				ExpectNonEmptyPlan: true,
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
@@ -448,7 +449,7 @@ func TestAcc_StreamOnView_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.T
 		Steps: []resource.TestStep{
 			// check that stale state is marked properly and forces an update
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -469,7 +470,7 @@ func TestAcc_StreamOnView_PermadiffWhenIsStaleAndHasNoRetentionTime(t *testing.T
 			// check that the resource was recreated
 			// note that it is stale again because we still have schema parameters set to 0
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
@@ -527,7 +528,7 @@ func TestAcc_StreamOnView_StaleWithExternalChanges(t *testing.T) {
 		Steps: []resource.TestStep{
 			// initial creation does not lead to stale stream
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -563,7 +564,7 @@ func TestAcc_StreamOnView_StaleWithExternalChanges(t *testing.T) {
 						HasStale(false),
 					)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.StreamOnViewResource(t, resourceName).
 					HasNameString(id.Name()).
 					HasStaleString(r.BooleanFalse),
@@ -856,7 +857,7 @@ func TestAcc_StreamOnView_InvalidConfiguration(t *testing.T) {
 			},
 			// invalid view id
 			{
-				Config:      config.FromModel(t, modelWithInvalidTableId),
+				Config:      config.FromModels(t, modelWithInvalidTableId),
 				ExpectError: regexp.MustCompile("Error: Invalid identifier type"),
 			},
 		},
@@ -882,7 +883,7 @@ func TestAcc_StreamOnView_ExternalStreamTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.StreamOnDirectoryTable),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: resource.ComposeTestCheckFunc(
 					assert.AssertThat(t,
 						resourceassert.StreamOnViewResource(t, model.ResourceReference()).
@@ -902,7 +903,7 @@ func TestAcc_StreamOnView_ExternalStreamTypeChange(t *testing.T) {
 					t.Cleanup(cleanup)
 					require.Equal(t, sdk.StreamSourceTypeTable, *externalChangeStream.SourceType)
 				},
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
diff --git a/pkg/resources/tag_acceptance_test.go b/pkg/resources/tag_acceptance_test.go
index 98ee76801e..58e7179c9f 100644
--- a/pkg/resources/tag_acceptance_test.go
+++ b/pkg/resources/tag_acceptance_test.go
@@ -5,6 +5,8 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
@@ -12,10 +14,8 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeroles"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
@@ -59,7 +59,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 		Steps: []resource.TestStep{
 			// base model
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, baseModel.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -81,14 +81,14 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// import without optionals
 			{
-				Config:            config.FromModel(t, baseModel),
+				Config:            config.FromModels(t, baseModel),
 				ResourceName:      baseModel.ResourceReference(),
 				ImportState:       true,
 				ImportStateVerify: true,
 			},
 			// set all fields
 			{
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithExtraFields.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -120,7 +120,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().Tag.Alter(t, sdk.NewAlterTagRequest(id).WithDrop([]string{"foo"}))
 				},
-				Config: config.FromModel(t, modelWithExtraFields),
+				Config: config.FromModels(t, modelWithExtraFields),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithExtraFields.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -149,7 +149,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// different set ordering
 			{
-				Config: config.FromModel(t, modelWithDifferentListOrder),
+				Config: config.FromModels(t, modelWithDifferentListOrder),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithDifferentListOrder.ResourceReference(), plancheck.ResourceActionNoop),
@@ -183,7 +183,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// change some values
 			{
-				Config: config.FromModel(t, modelWithDifferentValues),
+				Config: config.FromModels(t, modelWithDifferentValues),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithDifferentValues.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -212,7 +212,7 @@ func TestAcc_Tag_basic(t *testing.T) {
 			},
 			// unset optionals
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, baseModel.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -257,7 +257,7 @@ func TestAcc_Tag_complete(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Tag),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, model.ResourceReference()).
 					HasNameString(id.Name()).
 					HasDatabaseString(id.DatabaseName()).
@@ -285,7 +285,7 @@ func TestAcc_Tag_complete(t *testing.T) {
 				),
 			},
 			{
-				Config:            config.FromModel(t, model),
+				Config:            config.FromModels(t, model),
 				ResourceName:      model.ResourceReference(),
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -310,7 +310,7 @@ func TestAcc_Tag_Rename(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Tag),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, modelWithOldId),
+				Config: config.FromModels(t, modelWithOldId),
 				Check: assert.AssertThat(t, resourceassert.TagResource(t, modelWithOldId.ResourceReference()).
 					HasNameString(oldId.Name()).
 					HasDatabaseString(oldId.DatabaseName()).
@@ -318,7 +318,7 @@ func TestAcc_Tag_Rename(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, modelWithNewId),
+				Config: config.FromModels(t, modelWithNewId),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithOldId.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -360,7 +360,7 @@ func TestAcc_Tag_migrateFromVersion_0_98_0(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, model),
+				Config:                   config.FromModels(t, model),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(model.ResourceReference(), plancheck.ResourceActionNoop),
diff --git a/pkg/resources/tag_association_acceptance_test.go b/pkg/resources/tag_association_acceptance_test.go
index 86e616e529..ca77f6d57b 100644
--- a/pkg/resources/tag_association_acceptance_test.go
+++ b/pkg/resources/tag_association_acceptance_test.go
@@ -7,16 +7,16 @@ import (
 	"testing"
 
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
+	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
-	tfconfig "github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
@@ -186,7 +186,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model12),
+				Config: config.FromModels(t, model12),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model12.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -197,7 +197,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model123),
+				Config: config.FromModels(t, model123),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model12.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -209,7 +209,7 @@ func TestAcc_TagAssociation_objectIdentifiers(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, model13),
+				Config: config.FromModels(t, model13),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model13.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeDatabaseRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -248,7 +248,7 @@ func TestAcc_TagAssociation_objectType(t *testing.T) {
 		),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, baseModel),
+				Config: config.FromModels(t, baseModel),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, baseModel.ResourceReference()).
 					HasObjectTypeString(string(sdk.ObjectTypeRole)).
 					HasTagIdString(tag.ID().FullyQualifiedName()).
@@ -257,7 +257,7 @@ func TestAcc_TagAssociation_objectType(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, modelWithDifferentObjectType),
+				Config: config.FromModels(t, modelWithDifferentObjectType),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(modelWithDifferentObjectType.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -332,7 +332,7 @@ func TestAcc_TagAssociation_lowercaseObjectType(t *testing.T) {
 		CheckDestroy: nil,
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, model),
+				Config: config.FromModels(t, model),
 				Check: assert.AssertThat(t, resourceassert.TagAssociationResource(t, model.ResourceReference()).
 					HasIdString(helpers.EncodeSnowflakeID(tag.ID().FullyQualifiedName(), "foo", string(sdk.ObjectTypeSchema))).
 					HasObjectTypeString(string(sdk.ObjectTypeSchema)).
diff --git a/pkg/resources/task_acceptance_test.go b/pkg/resources/task_acceptance_test.go
index b2c50e76d6..46dbf626a3 100644
--- a/pkg/resources/task_acceptance_test.go
+++ b/pkg/resources/task_acceptance_test.go
@@ -7,24 +7,24 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectparametersassert"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceparametersassert"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
+	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	configvariable "github.com/hashicorp/terraform-plugin-testing/config"
-	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 
-	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/objectparametersassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceparametersassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceshowoutputassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/plancheck"
 	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
@@ -49,7 +49,7 @@ func TestAcc_Task_Basic(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -263,7 +263,7 @@ func TestAcc_Task_Updates(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -357,7 +357,7 @@ func TestAcc_Task_Updates(t *testing.T) {
 			},
 			// Unset
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(basicConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
@@ -459,7 +459,7 @@ func TestAcc_Task_UpdatesInComplexDAG(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(child3Id.FullyQualifiedName()).
@@ -480,7 +480,7 @@ func TestAcc_Task_UpdatesInComplexDAG(t *testing.T) {
 			},
 			// Update some fields in child3
 			{
-				Config: config.FromModel(t, basicConfigModelAfterUpdate),
+				Config: config.FromModels(t, basicConfigModelAfterUpdate),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModelAfterUpdate.ResourceReference()).
 						HasFullyQualifiedNameString(child3Id.FullyQualifiedName()).
@@ -527,7 +527,7 @@ func TestAcc_Task_StatementSpaces(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -545,7 +545,7 @@ func TestAcc_Task_StatementSpaces(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, configModelWithSpacesInStatements),
+				Config: config.FromModels(t, configModelWithSpacesInStatements),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -712,7 +712,7 @@ func TestAcc_Task_ExternalChanges(t *testing.T) {
 			},
 			// Unset optional values
 			{
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -774,7 +774,7 @@ func TestAcc_Task_ExternalChanges(t *testing.T) {
 						plancheck.ExpectResourceAction(basicConfigModel.ResourceReference(), plancheck.ResourceActionUpdate),
 					},
 				},
-				Config: config.FromModel(t, basicConfigModel),
+				Config: config.FromModels(t, basicConfigModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, basicConfigModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -839,7 +839,7 @@ func TestAcc_Task_CallingProcedure(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Task),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, configModel),
+				Config: config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
@@ -2537,7 +2537,7 @@ func TestAcc_Task_StateUpgradeWithAfter(t *testing.T) {
 			},
 			{
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, configModel),
+				Config:                   config.FromModels(t, configModel),
 				Check: assert.AssertThat(t,
 					resourceassert.TaskResource(t, configModel.ResourceReference()).
 						HasFullyQualifiedNameString(id.FullyQualifiedName()).
diff --git a/pkg/resources/usage_tracking_acceptance_test.go b/pkg/resources/usage_tracking_acceptance_test.go
index fcd866afcd..7f5262e409 100644
--- a/pkg/resources/usage_tracking_acceptance_test.go
+++ b/pkg/resources/usage_tracking_acceptance_test.go
@@ -5,23 +5,21 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
-	"github.com/hashicorp/terraform-plugin-testing/terraform"
-
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/assert/resourceassert"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/bettertestspoc/config/model"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/helpers/random"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
-	"github.com/hashicorp/terraform-plugin-testing/tfversion"
-
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/hashicorp/terraform-plugin-testing/tfversion"
 )
 
 func TestAcc_CompleteUsageTracking(t *testing.T) {
@@ -61,7 +59,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create
 			{
-				Config: config.FromModel(t, schemaModel),
+				Config: config.FromModels(t, schemaModel),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModel.ResourceReference()).
 						HasNameString(id.Name()).
@@ -83,7 +81,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 			},
 			// Update + CustomDiff (parameters) + Read
 			{
-				Config: config.FromModel(t, schemaModelWithComment),
+				Config: config.FromModels(t, schemaModelWithComment),
 				Check: assert.AssertThat(t,
 					resourceassert.SchemaResource(t, schemaModelWithComment.ResourceReference()).
 						HasNameString(id.Name()).
@@ -95,7 +93,7 @@ func TestAcc_CompleteUsageTracking(t *testing.T) {
 			},
 			// Delete
 			{
-				Config:  config.FromModel(t, schemaModelWithComment),
+				Config:  config.FromModels(t, schemaModelWithComment),
 				Destroy: true,
 				Check: assert.AssertThat(t,
 					assert.Check(assertQueryMetadataExists(t, tracking.DeleteOperation, fmt.Sprintf(`DROP SCHEMA IF EXISTS %s`, id.FullyQualifiedName()))),
diff --git a/pkg/resources/user_acceptance_test.go b/pkg/resources/user_acceptance_test.go
index 952fd2d98d..373e5b6914 100644
--- a/pkg/resources/user_acceptance_test.go
+++ b/pkg/resources/user_acceptance_test.go
@@ -64,8 +64,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 		WithDefaultRole("some_role").
 		WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 		WithMinsToBypassMfa(10).
-		WithRsaPublicKey(key1).
-		WithRsaPublicKey2(key2).
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key1)).
+		WithRsaPublicKey2Value(config.MultilineWrapperVariable(key2)).
 		WithComment(comment).
 		WithDisableMfa("true")
 
@@ -87,8 +87,8 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			WithDefaultRole("other_role").
 			WithDefaultSecondaryRolesOptionEnum(sdk.SecondaryRolesOptionAll).
 			WithMinsToBypassMfa(14).
-			WithRsaPublicKey(key2).
-			WithRsaPublicKey2(key1).
+			WithRsaPublicKeyValue(config.MultilineWrapperVariable(key2)).
+			WithRsaPublicKey2Value(config.MultilineWrapperVariable(key1)).
 			WithComment(newComment).
 			WithDisableMfa("false")
 	}
@@ -103,7 +103,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 		Steps: []resource.TestStep{
 			// CREATE WITHOUT ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -135,7 +135,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// RENAME AND CHANGE ONE PROP
 			{
-				Config: config.FromModel(t, userModelNoAttributesRenamed),
+				Config: config.FromModels(t, userModelNoAttributesRenamed),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id2.Name()).
@@ -162,12 +162,12 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// DESTROY
 			{
-				Config:  config.FromModel(t, userModelNoAttributes),
+				Config:  config.FromModels(t, userModelNoAttributes),
 				Destroy: true,
 			},
 			// CREATE WITH ALL ATTRIBUTES
 			{
-				Config: config.FromModel(t, userModelAllAttributes),
+				Config: config.FromModels(t, userModelAllAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelAllAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -196,7 +196,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// CHANGE PROPERTIES
 			{
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_other_login")),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelAllAttributesChanged(id.Name()+"_other_login").ResourceReference()).
 						HasNameString(id.Name()).
@@ -240,7 +240,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetLoginName(t, id, id.Name()+"_different_login")
 				},
-				Config: config.FromModel(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
+				Config: config.FromModels(t, userModelAllAttributesChanged(id.Name()+"_different_login")),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -249,7 +249,7 @@ func TestAcc_User_BasicFlows(t *testing.T) {
 			},
 			// UNSET ALL
 			{
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasNameString(id.Name()).
@@ -299,7 +299,7 @@ func TestAcc_User_RemovedOutsideOfTerraform(t *testing.T) {
 		},
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -308,7 +308,7 @@ func TestAcc_User_RemovedOutsideOfTerraform(t *testing.T) {
 			},
 			{
 				PreConfig: acc.TestClient().User.DropUserFunc(t, userId),
-				Config:    config.FromModel(t, userModel),
+				Config:    config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectNonEmptyPlan(),
@@ -347,7 +347,7 @@ func TestAcc_User_issue2058(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel1),
+				Config: config.FromModels(t, userModel1),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel1.ResourceReference()).HasNameString(userId.Name()),
 				),
@@ -434,7 +434,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 		Steps: []resource.TestStep{
 			// create with default values for all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -454,7 +454,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 			},
 			// set all parameters
 			{
-				Config: config.FromModel(t, userModelWithAllParametersSet),
+				Config: config.FromModels(t, userModelWithAllParametersSet),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAbortDetachedQuery(true).
@@ -644,7 +644,7 @@ func TestAcc_User_AllParameters(t *testing.T) {
 			},
 			// unset all the parameters
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectparametersassert.UserParameters(t, userId).
 						HasAllDefaults().
@@ -674,7 +674,7 @@ func TestAcc_User_issue2836(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					objectassert.User(t, userId).
 						HasDefaultRole(defaultRole),
@@ -696,15 +696,15 @@ func TestAcc_User_issue2970(t *testing.T) {
 
 	userModel := model.User(resourceName, userId.Name()).
 		WithPassword(pass).
-		WithRsaPublicKey(key)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(key))
 
 	newUserModelIncorrectNewKey := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKey(incorrectlyFormattedNewKey)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(incorrectlyFormattedNewKey))
 
 	newUserModel := model.User(resourceName, userId.Name()).
 		WithPassword(newPass).
-		WithRsaPublicKey(newKey)
+		WithRsaPublicKeyValue(config.MultilineWrapperVariable(newKey))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -715,7 +715,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass).
@@ -723,7 +723,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 				),
 			},
 			{
-				Config: config.FromModel(t, newUserModelIncorrectNewKey),
+				Config: config.FromModels(t, newUserModelIncorrectNewKey),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(newUserModelIncorrectNewKey.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), sdk.String(newPass)),
@@ -733,7 +733,7 @@ func TestAcc_User_issue2970(t *testing.T) {
 				ExpectError: regexp.MustCompile("New public key rejected by current policy"),
 			},
 			{
-				Config: config.FromModel(t, newUserModel),
+				Config: config.FromModels(t, newUserModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(newUserModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), sdk.String(newPass)),
@@ -764,7 +764,7 @@ func TestAcc_User_issue1572(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasDisabledString(r.BooleanDefault),
@@ -776,7 +776,7 @@ func TestAcc_User_issue1572(t *testing.T) {
 					acc.TestClient().User.Disable(t, userId)
 					objectassert.User(t, userId).HasDisabled(true)
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectDrift(userModel.ResourceReference(), "disabled", sdk.String(r.BooleanDefault), sdk.String(r.BooleanTrue)),
@@ -812,14 +812,14 @@ func TestAcc_User_issue1535_withNullPassword(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass),
 				),
 			},
 			{
-				Config: config.FromModel(t, userWithNullPasswordModel),
+				Config: config.FromModels(t, userWithNullPasswordModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userWithNullPasswordModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), nil),
@@ -852,14 +852,14 @@ func TestAcc_User_issue1535_withRemovedPassword(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasPasswordString(pass),
 				),
 			},
 			{
-				Config: config.FromModel(t, userWithoutPasswordModel),
+				Config: config.FromModels(t, userWithoutPasswordModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userWithoutPasswordModel.ResourceReference(), "password", tfjson.ActionUpdate, sdk.String(pass), nil),
@@ -892,7 +892,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 		Steps: []resource.TestStep{
 			// 1. create without days_to_expiry
 			{
-				Config: config.FromModel(t, userModelWithoutDaysToExpiry),
+				Config: config.FromModels(t, userModelWithoutDaysToExpiry),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithoutDaysToExpiry.ResourceReference()).HasNoDaysToExpiry(),
 					objectassert.User(t, userId).HasDaysToExpiryEmpty(),
@@ -900,7 +900,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 2. change to 10 (no plan after)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelDaysToExpiry10.ResourceReference()).HasDaysToExpiryString("10"),
 					objectassert.User(t, userId).HasDaysToExpiryNotEmpty(),
@@ -911,7 +911,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetDaysToExpiry(t, userId, 2)
 				},
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -923,7 +923,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.SetDaysToExpiry(t, userId, 0)
 				},
-				Config: config.FromModel(t, userModelDaysToExpiry10),
+				Config: config.FromModels(t, userModelDaysToExpiry10),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -932,7 +932,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 5. change in config to 5 (change)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry5),
+				Config: config.FromModels(t, userModelDaysToExpiry5),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelDaysToExpiry5.ResourceReference(), "days_to_expiry", tfjson.ActionUpdate, sdk.String("10"), sdk.String("5")),
@@ -945,7 +945,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 6. change in config to 0 (change)
 			{
-				Config: config.FromModel(t, userModelDaysToExpiry0),
+				Config: config.FromModels(t, userModelDaysToExpiry0),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelDaysToExpiry0.ResourceReference(), "days_to_expiry", tfjson.ActionUpdate, sdk.String("5"), sdk.String("0")),
@@ -958,7 +958,7 @@ func TestAcc_User_issue1155_handleChangesToDaysToExpiry(t *testing.T) {
 			},
 			// 7. remove from config (no change)
 			{
-				Config: config.FromModel(t, userModelWithoutDaysToExpiry),
+				Config: config.FromModels(t, userModelWithoutDaysToExpiry),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -987,7 +987,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).HasNameString(userId.Name()).HasUserTypeString(""),
 					resourceshowoutputassert.UserShowOutput(t, userModel.ResourceReference()).HasType(""),
@@ -998,7 +998,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypeService)
 					objectassert.User(t, userId).HasType(string(sdk.UserTypeService))
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction(userModel.ResourceReference(), plancheck.ResourceActionDestroyBeforeCreate),
@@ -1015,7 +1015,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.SetType(t, userId, sdk.UserTypePerson)
 					objectassert.User(t, userId).HasType("PERSON")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1032,7 +1032,7 @@ func TestAcc_User_handleExternalTypeChange(t *testing.T) {
 					acc.TestClient().User.UnsetType(t, userId)
 					objectassert.User(t, userId).HasType("")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1056,7 +1056,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 	userModelLowercaseValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("all")
 	userModelIncorrectValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("OTHER")
 	userModelEmptyValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("")
-	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.NullVariable())
+	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -1068,7 +1068,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 		Steps: []resource.TestStep{
 			// 1. create without default secondary roles option set (DEFAULT will be used)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(""),
@@ -1076,7 +1076,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 2. add default secondary roles NONE (expecting change because null != [] on Snowflake side)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectNonEmptyPlan(),
@@ -1089,7 +1089,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 3. add default secondary roles ALL
 			{
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionAll.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionAll),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1097,7 +1097,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 4. change to lowercase (no changes)
 			{
-				Config: config.FromModel(t, userModelLowercaseValue),
+				Config: config.FromModels(t, userModelLowercaseValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1109,7 +1109,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.UnsetDefaultSecondaryRoles(t, userId)
 				},
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionAll.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("ALL")),
@@ -1122,7 +1122,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 6. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("DEFAULT")),
@@ -1135,17 +1135,17 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 7. incorrect value used
 			{
-				Config:      config.FromModel(t, userModelIncorrectValue),
+				Config:      config.FromModels(t, userModelIncorrectValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: OTHER"),
 			},
 			// 8. set to empty in config (invalid)
 			{
-				Config:      config.FromModel(t, userModelEmptyValue),
+				Config:      config.FromModels(t, userModelEmptyValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: "),
 			},
 			// 9. set in config to NONE (change)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("NONE")),
@@ -1158,7 +1158,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 10. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1171,7 +1171,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 11. add default secondary roles ALL
 			{
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionAll.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionAll),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1179,7 +1179,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles(t *testing.T) {
 			},
 			// 12. set to null value in config (change)
 			{
-				Config: config.FromModel(t, userModelNullValue),
+				Config: config.FromModels(t, userModelNullValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelNullValue.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("DEFAULT")),
@@ -1203,7 +1203,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 	userModelLowercaseValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("all")
 	userModelIncorrectValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("OTHER")
 	userModelEmptyValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOption("")
-	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.NullVariable())
+	userModelNullValue := model.UserWithDefaultMeta(userId.Name()).WithDefaultSecondaryRolesOptionValue(config.ReplacementPlaceholderVariable(config.SnowflakeProviderConfigNull))
 
 	resource.Test(t, resource.TestCase{
 		ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
@@ -1218,7 +1218,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_07")
 				},
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1231,11 +1231,11 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 						plancheck.ExpectEmptyPlan(),
 					},
 				},
-				Config: config.FromModel(t, userModelWithOptionAll),
+				Config: config.FromModels(t, userModelWithOptionAll),
 			},
 			// 3. change to lowercase (change because we have DEFAULT in state because previous step was suppressed so none of the suppressors NormalizeAndCompare nor IgnoreChangeToCurrentSnowflakeValueInShowWithMapping suppresses it; it can be made better later)
 			{
-				Config: config.FromModel(t, userModelLowercaseValue),
+				Config: config.FromModels(t, userModelLowercaseValue),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("all")),
@@ -1248,7 +1248,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 4. add default secondary roles NONE
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithOptionNone.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionNone),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`[]`),
@@ -1259,7 +1259,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().User.UnsetDefaultSecondaryRoles(t, userId)
 				},
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("ALL"), sdk.String("NONE")),
@@ -1272,7 +1272,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 6. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1285,17 +1285,17 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 7. incorrect value used
 			{
-				Config:      config.FromModel(t, userModelIncorrectValue),
+				Config:      config.FromModels(t, userModelIncorrectValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: OTHER"),
 			},
 			// 8. set to empty in config (invalid)
 			{
-				Config:      config.FromModel(t, userModelEmptyValue),
+				Config:      config.FromModels(t, userModelEmptyValue),
 				ExpectError: regexp.MustCompile("invalid secondary roles option: "),
 			},
 			// 9. set in config to NONE (change)
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelWithOptionNone.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("DEFAULT"), sdk.String("NONE")),
@@ -1308,7 +1308,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 10. unset in config (change)
 			{
-				Config: config.FromModel(t, userModelEmpty),
+				Config: config.FromModels(t, userModelEmpty),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectChange(userModelEmpty.ResourceReference(), "default_secondary_roles_option", tfjson.ActionUpdate, sdk.String("NONE"), sdk.String("DEFAULT")),
@@ -1321,7 +1321,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 11. add default secondary roles NONE
 			{
-				Config: config.FromModel(t, userModelWithOptionNone),
+				Config: config.FromModels(t, userModelWithOptionNone),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionNone),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`[]`),
@@ -1329,7 +1329,7 @@ func TestAcc_User_handleChangesToDefaultSecondaryRoles_bcr202407(t *testing.T) {
 			},
 			// 12. set to null value in config (change)
 			{
-				Config: config.FromModel(t, userModelNullValue),
+				Config: config.FromModels(t, userModelNullValue),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelEmpty.ResourceReference()).HasDefaultSecondaryRolesOption(sdk.SecondaryRolesOptionDefault),
 					objectassert.User(t, userId).HasDefaultSecondaryRoles(`["ALL"]`),
@@ -1359,7 +1359,7 @@ func TestAcc_User_migrateFromVersion094_noDefaultSecondaryRolesSet(t *testing.T)
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(userModel.ResourceReference(), "name", id.Name()),
 					resource.TestCheckResourceAttr(userModel.ResourceReference(), "default_secondary_roles.#", "0"),
@@ -1368,7 +1368,7 @@ func TestAcc_User_migrateFromVersion094_noDefaultSecondaryRolesSet(t *testing.T)
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						// we do not have a plancheck yet to validate no changes on the given field; this is a current alternative
@@ -1420,7 +1420,7 @@ resource "snowflake_user" "test" {
 			{
 				PreConfig:                func() { acc.UnsetConfigPathEnv(t) },
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModelWithOptionAll),
+				Config:                   config.FromModels(t, userModelWithOptionAll),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						// we do not have a plancheck yet to validate no changes on the given field; this is a current alternative
@@ -1459,7 +1459,7 @@ func TestAcc_User_ParameterValidationsAndDiffSuppressions(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.User),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasBinaryInputFormatString(string(sdk.BinaryInputFormatHex)).
@@ -1493,7 +1493,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 		Steps: []resource.TestStep{
 			// Create without both set
 			{
-				Config: config.FromModel(t, userModelWithoutBoth),
+				Config: config.FromModels(t, userModelWithoutBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithoutBoth.ResourceReference()).
 						HasNoDisplayName().
@@ -1505,7 +1505,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Rename
 			{
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasNoDisplayName().
@@ -1517,7 +1517,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Set both params
 			{
-				Config: config.FromModel(t, userModelWithBoth),
+				Config: config.FromModels(t, userModelWithBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithBoth.ResourceReference()).
 						HasDisplayNameString("display_name").
@@ -1539,7 +1539,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 						},
 					})
 				},
-				Config: config.FromModel(t, userModelWithBoth),
+				Config: config.FromModels(t, userModelWithBoth),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithBoth.ResourceReference()).
 						HasDisplayNameString("display_name").
@@ -1551,7 +1551,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 			},
 			// Unset both params
 			{
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasDisplayNameString("").
@@ -1575,7 +1575,7 @@ func TestAcc_User_LoginNameAndDisplayName(t *testing.T) {
 						},
 					})
 				},
-				Config: config.FromModel(t, userModelWithNewId),
+				Config: config.FromModels(t, userModelWithNewId),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNewId.ResourceReference()).
 						HasDisplayNameString("").
@@ -1609,14 +1609,14 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_gh3125(t *testing.T) {
 				PreConfig: func() {
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_08")
 				},
-				Config: config.FromModel(t, userModelNoAttributes),
+				Config: config.FromModels(t, userModelNoAttributes),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelNoAttributes.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
 				),
 			},
 			{
-				Config: config.FromModel(t, userModelWithNoneDefaultSecondaryRoles),
+				Config: config.FromModels(t, userModelWithNoneDefaultSecondaryRoles),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModelWithNoneDefaultSecondaryRoles.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionNone),
@@ -1647,7 +1647,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_gh3125_withbcr202407(t *tes
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_07")
 					acc.TestClient().BcrBundles.EnableBcrBundle(t, "2024_08")
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionNone),
@@ -1683,7 +1683,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_enabled
 						Source:            "Snowflake-Labs/snowflake",
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
@@ -1695,7 +1695,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_enabled
 					func() { acc.UnsetConfigPathEnv(t) }()
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						plancheck.ExpectEmptyPlan(),
@@ -1733,7 +1733,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_disable
 					},
 				},
 				PreConfig: func() { acc.SetV097CompatibleConfigPathEnv(t) },
-				Config:    config.FromModel(t, userModel),
+				Config:    config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasAllDefaults(userId, sdk.SecondaryRolesOptionDefault),
@@ -1745,7 +1745,7 @@ func TestAcc_User_handleChangesToShowUsers_bcr202408_migration_bcr202407_disable
 					func() { acc.UnsetConfigPathEnv(t) }()
 				},
 				ProtoV6ProviderFactories: acc.TestAccProtoV6ProviderFactories,
-				Config:                   config.FromModel(t, userModel),
+				Config:                   config.FromModels(t, userModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PreApply: []plancheck.PlanCheck{
 						planchecks.ExpectDrift(userModel.ResourceReference(), "default_secondary_roles_option", sdk.String(string(sdk.SecondaryRolesOptionDefault)), sdk.String(string(sdk.SecondaryRolesOptionAll))),
@@ -1790,7 +1790,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 		Steps: []resource.TestStep{
 			// IMPORT
 			{
-				Config:        config.FromModel(t, userModel),
+				Config:        config.FromModels(t, userModel),
 				ResourceName:  userModel.ResourceReference(),
 				ImportState:   true,
 				ImportStateId: userId.Name(),
@@ -1802,7 +1802,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 				ImportStatePersist: true,
 			},
 			{
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasNotEmptyPassword().
@@ -1815,7 +1815,7 @@ func TestAcc_User_importPassword(t *testing.T) {
 						plancheck.ExpectEmptyPlan(),
 					},
 				},
-				Config: config.FromModel(t, userModel),
+				Config: config.FromModels(t, userModel),
 				Check: assert.AssertThat(t,
 					resourceassert.UserResource(t, userModel.ResourceReference()).
 						HasNotEmptyPassword().
diff --git a/pkg/resources/view_acceptance_test.go b/pkg/resources/view_acceptance_test.go
index b72822016e..39dff6e829 100644
--- a/pkg/resources/view_acceptance_test.go
+++ b/pkg/resources/view_acceptance_test.go
@@ -451,7 +451,7 @@ func TestAcc_View_temporary(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel.WithIsTemporary("true")),
+				Config: accconfig.FromModels(t, viewModel.WithIsTemporary("true")),
 				Check: assert.AssertThat(t, resourceassert.ViewResource(t, "snowflake_view.test").
 					HasNameString(id.Name()).
 					HasStatementString(statement).
@@ -949,7 +949,7 @@ func TestAcc_View_Issue3073(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -973,7 +973,7 @@ func TestAcc_View_Issue3073(t *testing.T) {
 				),
 			},
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -1007,7 +1007,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.View),
 		Steps: []resource.TestStep{
 			{
-				Config: accconfig.FromModel(t, viewModel),
+				Config: accconfig.FromModels(t, viewModel),
 				ConfigPlanChecks: resource.ConfigPlanChecks{
 					PostApplyPostRefresh: []plancheck.PlanCheck{
 						plancheck.ExpectResourceAction("snowflake_view.test", plancheck.ResourceActionNoop),
@@ -1022,7 +1022,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 			},
 			// use columns without quotes in the statement
 			{
-				Config: accconfig.FromModel(t, viewLowercaseStatementModel),
+				Config: accconfig.FromModels(t, viewLowercaseStatementModel),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", id.Name()),
 					resource.TestCheckResourceAttr("snowflake_view.test", "column.#", "2"),
@@ -1032,7 +1032,7 @@ func TestAcc_View_IncorrectColumnsWithOrReplace(t *testing.T) {
 			},
 			// add a new column to the statement
 			{
-				Config: accconfig.FromModel(t, viewLowercaseStatementModel3),
+				Config: accconfig.FromModels(t, viewLowercaseStatementModel3),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("snowflake_view.test", "name", id.Name()),
 					resource.TestCheckResourceAttr("snowflake_view.test", "column.#", "3"),
diff --git a/pkg/resources/warehouse_acceptance_test.go b/pkg/resources/warehouse_acceptance_test.go
index 49f3d678ce..e481cb876f 100644
--- a/pkg/resources/warehouse_acceptance_test.go
+++ b/pkg/resources/warehouse_acceptance_test.go
@@ -7,8 +7,6 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
-
 	acc "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance"
 	r "github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/resources"
 	tfjson "github.com/hashicorp/terraform-json"
@@ -25,6 +23,7 @@ import (
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/importchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/planchecks"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/acceptance/testenvs"
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
@@ -59,7 +58,7 @@ func TestAcc_Warehouse_BasicFlows(t *testing.T) {
 		CheckDestroy: acc.CheckDestroy(t, resources.Warehouse),
 		Steps: []resource.TestStep{
 			{
-				Config: config.FromModel(t, warehouseModel),
+				Config: config.FromModels(t, warehouseModel),
 				Check: assert.AssertThat(t,
 					resourceassert.WarehouseResource(t, "snowflake_warehouse.w").
 						HasNameString(name).
diff --git a/pkg/sdk/testint/procedures_integration_test.go b/pkg/sdk/testint/procedures_integration_test.go
index b0a935f070..1b31107ddd 100644
--- a/pkg/sdk/testint/procedures_integration_test.go
+++ b/pkg/sdk/testint/procedures_integration_test.go
@@ -2093,7 +2093,7 @@ def filter_by_role(session, table_name, role):
 		assert.Equal(t, "(x FLOAT)", *pairs["signature"])
 		assert.Equal(t, "FLOAT", *pairs["returns"])
 		assert.Equal(t, "SQL", *pairs["language"])
-		assert.Equal(t, "\nBEGIN\n\tRETURN 3.141592654::FLOAT;\nEND;\n", *pairs["body"])
+		assert.Equal(t, "BEGIN\n  RETURN 3.141592654::FLOAT;\nEND;\n", *pairs["body"])
 		assert.Equal(t, "OWNER", *pairs["execute as"])
 	})