diff --git a/assert_test.go b/assert_test.go
index 8714df3d9..ed2475ae3 100644
--- a/assert_test.go
+++ b/assert_test.go
@@ -76,6 +76,10 @@ func assertStringContainsF(t *testing.T, actual string, expectedToContain string
 	fatalOnNonEmpty(t, validateStringContains(actual, expectedToContain, descriptions...))
 }
 
+func assertStringDoesNotContainE(t *testing.T, actual string, expectedNotToContain string, descriptions ...string) {
+	errorOnNonEmpty(t, validateStringDoesNotContain(actual, expectedNotToContain, descriptions...))
+}
+
 func assertEmptyStringE(t *testing.T, actual string, descriptions ...string) {
 	errorOnNonEmpty(t, validateEmptyString(actual, descriptions...))
 }
@@ -184,6 +188,14 @@ func validateStringContains(actual string, expectedToContain string, description
 	return fmt.Sprintf("expected \"%s\" to contain \"%s\" but did not. %s", actual, expectedToContain, desc)
 }
 
+func validateStringDoesNotContain(actual string, expectedToNotContain string, descriptions ...string) string {
+	if !strings.Contains(actual, expectedToNotContain) {
+		return ""
+	}
+	desc := joinDescriptions(descriptions...)
+	return fmt.Sprintf("expected \"%s\" not to contain \"%s\" but it did. %s", actual, expectedToNotContain, desc)
+}
+
 func validateEmptyString(actual string, descriptions ...string) string {
 	if actual == "" {
 		return ""
diff --git a/azure_storage_client.go b/azure_storage_client.go
index ae1b72118..73abca48e 100644
--- a/azure_storage_client.go
+++ b/azure_storage_client.go
@@ -92,6 +92,8 @@ func (util *snowflakeAzureClient) getFileHeader(meta *fileMetadata, filename str
 	if err != nil {
 		var se *azcore.ResponseError
 		if errors.As(err, &se) {
+			print("azure getFileHeader: ")
+			println(se.StatusCode, se.ErrorCode)
 			if se.ErrorCode == string(bloberror.BlobNotFound) {
 				meta.resStatus = notFoundFile
 				return nil, fmt.Errorf("could not find file")
@@ -100,6 +102,7 @@ func (util *snowflakeAzureClient) getFileHeader(meta *fileMetadata, filename str
 				return nil, fmt.Errorf("received 403, attempting to renew")
 			}
 		}
+		println("unknown azure error")
 		meta.resStatus = errStatus
 		return nil, err
 	}
@@ -233,6 +236,8 @@ func (util *snowflakeAzureClient) uploadFile(
 	if err != nil {
 		var se *azcore.ResponseError
 		if errors.As(err, &se) {
+			print("azure upload file: ")
+			println(se.StatusCode, se.ErrorCode)
 			if se.StatusCode == 403 && util.detectAzureTokenExpireError(se.RawResponse) {
 				meta.resStatus = renewToken
 			} else {
@@ -241,6 +246,7 @@ func (util *snowflakeAzureClient) uploadFile(
 			}
 			return err
 		}
+		println("Unknown azure error")
 		meta.resStatus = errStatus
 		return err
 	}
diff --git a/driver_ocsp_test.go b/driver_ocsp_test.go
index 96b8f6f27..bbbfc94cd 100644
--- a/driver_ocsp_test.go
+++ b/driver_ocsp_test.go
@@ -723,7 +723,7 @@ func TestExpiredCertificate(t *testing.T) {
 		// Go 1.20 throws tls CertificateVerification error
 		errString := urlErr.Err.Error()
 		// badssl sometimes times out
-		if !strings.Contains(errString, "certificate has expired or is not yet valid") && !strings.Contains(errString, "timeout") {
+		if !strings.Contains(errString, "certificate has expired or is not yet valid") && !strings.Contains(errString, "timeout") && !strings.Contains(errString, "established connection failed because connected host has failed to respond") {
 			t.Fatalf("failed to extract error Certificate error: %v", err)
 		}
 	}
diff --git a/function_wrapper_test.go b/function_wrapper_test.go
index 585e6afec..ecb885c53 100644
--- a/function_wrapper_test.go
+++ b/function_wrapper_test.go
@@ -39,8 +39,12 @@ func TestGoWrapper(t *testing.T) {
 		GoroutineWrapper = closeGoWrapperCalledChannel
 
 		ctx := WithAsyncMode(context.Background())
+		println("Staring SELECT 1 query")
 		rows := dbt.mustQueryContext(ctx, "SELECT 1")
+		assertTrueE(t, rows.Next())
 		defer rows.Close()
+		var i int
+		assertNilF(t, rows.Scan(&i))
 
 		assertTrueF(t, getGoWrapperCalled(), "channel should be closed, indicating our wrapper worked")
 	})
diff --git a/gcs_storage_client.go b/gcs_storage_client.go
index 0627f6122..cbfb9aaaa 100644
--- a/gcs_storage_client.go
+++ b/gcs_storage_client.go
@@ -78,6 +78,8 @@ func (util *snowflakeGcsClient) getFileHeader(meta *fileMetadata, filename strin
 		if err != nil {
 			return nil, err
 		}
+		print("GCS getFileHeader: ")
+		println(resp.StatusCode)
 		if resp.StatusCode != http.StatusOK {
 			meta.lastError = fmt.Errorf("%v", resp.Status)
 			meta.resStatus = errStatus
@@ -224,6 +226,9 @@ func (util *snowflakeGcsClient) uploadFile(
 	if err != nil {
 		return err
 	}
+	print("GCS uploadFile: ")
+	println(err.Error())
+	println(resp.StatusCode)
 	if resp.StatusCode != http.StatusOK {
 		if resp.StatusCode == 403 || resp.StatusCode == 408 || resp.StatusCode == 429 || resp.StatusCode == 500 || resp.StatusCode == 503 {
 			meta.lastError = fmt.Errorf("%v", resp.Status)
diff --git a/put_get_test.go b/put_get_test.go
index 1308e7419..3c5d19406 100644
--- a/put_get_test.go
+++ b/put_get_test.go
@@ -716,10 +716,9 @@ func TestPutGetLargeFile(t *testing.T) {
 			assertNilF(t, rows.Close())
 		}()
 		var file, s1, s2, s3 string
-		if rows.Next() {
-			err = rows.Scan(&file, &s1, &s2, &s3)
-			assertNilF(t, err)
-		}
+		assertTrueF(t, rows.Next())
+		err = rows.Scan(&file, &s1, &s2, &s3)
+		assertNilF(t, err)
 
 		if !strings.Contains(file, "largefile.txt.gz") {
 			t.Fatalf("should contain file. got: %v", file)
diff --git a/s3_storage_client.go b/s3_storage_client.go
index c389c3127..f8086bd5a 100644
--- a/s3_storage_client.go
+++ b/s3_storage_client.go
@@ -100,6 +100,8 @@ func (util *snowflakeS3Client) getFileHeader(meta *fileMetadata, filename string
 	}
 	out, err := s3Cli.HeadObject(context.Background(), headObjInput)
 	if err != nil {
+		print("err in S3 getFileHeader: ")
+		println(err.Error())
 		var ae smithy.APIError
 		if errors.As(err, &ae) {
 			if ae.ErrorCode() == notFound {
@@ -217,6 +219,8 @@ func (util *snowflakeS3Client) uploadFile(
 	}
 
 	if err != nil {
+		print("err in S3 uploadFile: ")
+		println(err.Error())
 		var ae smithy.APIError
 		if errors.As(err, &ae) {
 			if ae.ErrorCode() == expiredToken {
diff --git a/storage_client.go b/storage_client.go
index e855dba13..bc7471e24 100644
--- a/storage_client.go
+++ b/storage_client.go
@@ -89,11 +89,12 @@ func (rsu *remoteStorageUtil) uploadOneFile(meta *fileMetadata) error {
 		if !meta.overwrite {
 			header, err := utilClass.getFileHeader(meta, meta.dstFileName)
 			if meta.resStatus == notFoundFile {
-				err := utilClass.uploadFile(dataFile, meta, encryptMeta, maxConcurrency, meta.options.MultiPartThreshold)
-				if err != nil {
+				err2 := utilClass.uploadFile(dataFile, meta, encryptMeta, maxConcurrency, meta.options.MultiPartThreshold)
+				if err2 != nil {
 					logger.Warnf("Error uploading %v. err: %v", dataFile, err)
 				}
 			} else if err != nil {
+				println(err)
 				return err
 			}
 			if header != nil && meta.resStatus == uploaded {