diff --git a/pkg/acceptance/helpers/information_schema_client.go b/pkg/acceptance/helpers/information_schema_client.go
index cfcc5a1e22..9ed99e4e19 100644
--- a/pkg/acceptance/helpers/information_schema_client.go
+++ b/pkg/acceptance/helpers/information_schema_client.go
@@ -3,9 +3,10 @@ package helpers
 import (
 	"context"
 	"fmt"
+	"testing"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 type InformationSchemaClient struct {
diff --git a/pkg/internal/tracking/context.go b/pkg/internal/tracking/context.go
index f0eb74d51c..9519bf1bb4 100644
--- a/pkg/internal/tracking/context.go
+++ b/pkg/internal/tracking/context.go
@@ -3,6 +3,7 @@ package tracking
 import (
 	"context"
 	"errors"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 )
 
diff --git a/pkg/internal/tracking/context_test.go b/pkg/internal/tracking/context_test.go
index eea2dfaed8..96e38f75a3 100644
--- a/pkg/internal/tracking/context_test.go
+++ b/pkg/internal/tracking/context_test.go
@@ -2,9 +2,10 @@ package tracking
 
 import (
 	"context"
+	"testing"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func Test_Context(t *testing.T) {
diff --git a/pkg/internal/tracking/query.go b/pkg/internal/tracking/query.go
index a3cb2a9a45..e49421b1a9 100644
--- a/pkg/internal/tracking/query.go
+++ b/pkg/internal/tracking/query.go
@@ -22,7 +22,7 @@ func ParseMetadata(sql string) (Metadata, error) {
 	}
 	var metadata Metadata
 	if err := json.Unmarshal([]byte(strings.TrimSpace(parts[1])), &metadata); err != nil {
-		return Metadata{}, fmt.Errorf("failed to unmarshal metadata from sql: %s, err = %s", sql, err)
+		return Metadata{}, fmt.Errorf("failed to unmarshal metadata from sql: %s, err = %w", sql, err)
 	}
 	if err := metadata.validate(); err != nil {
 		return Metadata{}, err
diff --git a/pkg/internal/tracking/query_test.go b/pkg/internal/tracking/query_test.go
index 077bb39725..6d46162186 100644
--- a/pkg/internal/tracking/query_test.go
+++ b/pkg/internal/tracking/query_test.go
@@ -3,9 +3,10 @@ package tracking
 import (
 	"encoding/json"
 	"fmt"
+	"testing"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestAppendMetadata(t *testing.T) {
diff --git a/pkg/resources/common.go b/pkg/resources/common.go
index b33a0f433d..36a1da648a 100644
--- a/pkg/resources/common.go
+++ b/pkg/resources/common.go
@@ -2,11 +2,12 @@ package resources
 
 import (
 	"context"
+	"regexp"
+	"strings"
+
 	"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-sdk/v2/diag"
-	"regexp"
-	"strings"
 
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 
diff --git a/pkg/resources/schema.go b/pkg/resources/schema.go
index f485428333..e406eb31e2 100644
--- a/pkg/resources/schema.go
+++ b/pkg/resources/schema.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"log"
 	"slices"
 	"strings"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/helpers"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/collections"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/provider"
diff --git a/pkg/sdk/client.go b/pkg/sdk/client.go
index b7796b9ffe..134313439d 100644
--- a/pkg/sdk/client.go
+++ b/pkg/sdk/client.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
 	"log"
 	"os"
 	"slices"
 
+	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/snowflakeenvs"
 	"github.com/jmoiron/sqlx"
 	"github.com/luna-duclos/instrumentedsql"
diff --git a/pkg/sdk/testint/basic_object_tracking_integration_test.go b/pkg/sdk/testint/basic_object_tracking_integration_test.go
index 9e70f0813d..673eb31df3 100644
--- a/pkg/sdk/testint/basic_object_tracking_integration_test.go
+++ b/pkg/sdk/testint/basic_object_tracking_integration_test.go
@@ -3,11 +3,12 @@ package testint
 import (
 	"context"
 	"fmt"
+	"strings"
+	"testing"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/sdk"
 	"github.com/snowflakedb/gosnowflake"
 	"github.com/stretchr/testify/require"
-	"strings"
-	"testing"
 )
 
 // Research for basic object tracking done as part of SNOW-1737787
@@ -70,6 +71,7 @@ func TestInt_ContextQueryTags(t *testing.T) {
 }
 
 func executeQueryAndReturnQueryId(t *testing.T, ctx context.Context, client *sdk.Client) string {
+	t.Helper()
 	queryIdChan := make(chan string, 1)
 	ctx = gosnowflake.WithQueryIDChan(ctx, queryIdChan)
 
diff --git a/pkg/sdk/testint/client_integration_test.go b/pkg/sdk/testint/client_integration_test.go
index 64fd237ed2..47a38e5449 100644
--- a/pkg/sdk/testint/client_integration_test.go
+++ b/pkg/sdk/testint/client_integration_test.go
@@ -2,11 +2,12 @@ package testint
 
 import (
 	"context"
+	"testing"
+
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/internal/tracking"
 	"github.com/Snowflake-Labs/terraform-provider-snowflake/pkg/provider/resources"
 	"github.com/snowflakedb/gosnowflake"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestInt_Client_AdditionalMetadata(t *testing.T) {