diff --git a/config/component_test.go b/config/component_test.go
index c76adb30..582c1327 100644
--- a/config/component_test.go
+++ b/config/component_test.go
@@ -181,7 +181,9 @@ func TestCreateTargetComponentHCL(t *testing.T) {
 
 			c, err := NewConfig()
 			assert.NotNil(c)
-			assert.Nil(err)
+			if err != nil {
+				t.Fatalf("function NewConfig failed with error: %q", err.Error())
+			}
 
 			use := c.Data.Target.Use
 			decoderOpts := &DecoderOptions{
@@ -260,7 +262,9 @@ func TestCreateFailureTargetComponentENV(t *testing.T) {
 
 		c, err := NewConfig()
 		assert.NotNil(c)
-		assert.Nil(err)
+		if err != nil {
+			t.Fatalf("function NewConfig failed with error: %q", err.Error())
+		}
 
 		assert.Equal(c.Data.FailureTarget.Target.Name, "kafka")
 		decoderOpts := &DecoderOptions{
@@ -305,7 +309,10 @@ func TestCreateObserverComponentHCL(t *testing.T) {
 
 			c, err := NewConfig()
 			assert.NotNil(c)
-			assert.Nil(err)
+			if err != nil {
+				t.Fatalf("function NewConfig failed with error: %q", err.Error())
+			}
+
 			assert.Equal(c.Data.StatsReceiver.TimeoutSec, 2)
 			assert.Equal(c.Data.StatsReceiver.BufferSec, 20)
 
diff --git a/config/config_test.go b/config/config_test.go
index ce03c7d8..3cdec05a 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -20,11 +20,13 @@ func TestNewConfig(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	assert.Equal("info", c.Data.LogLevel)
 	assert.Equal("stdout", c.Data.Target.Use.Name)
-	assert.Equal("none", c.Data.Transformation)
+	assert.Equal("none", c.Data.Transform.Transformation)
 	assert.Equal("stdin", c.Data.Source.Use.Name)
 
 	// Tests on sources moved to the source package.
@@ -60,7 +62,9 @@ func TestNewConfig_FromEnv(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	assert.Equal("debug", c.Data.LogLevel)
 	assert.Equal("kinesis", c.Data.Target.Use.Name)
@@ -88,7 +92,9 @@ func TestNewConfig_InvalidTransformation(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	transformation, err := c.GetTransformations()
 	assert.Nil(transformation)
@@ -105,7 +111,9 @@ func TestNewConfig_FilterFailure(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	transformation, err := c.GetTransformations()
 	assert.Nil(transformation)
@@ -122,7 +130,9 @@ func TestNewConfig_InvalidTarget(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	source, err := c.GetTarget()
 	assert.Nil(source)
@@ -139,7 +149,9 @@ func TestNewConfig_InvalidFailureTarget(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	source, err := c.GetFailureTarget("testAppName", "0.0.0")
 	assert.Nil(source)
@@ -156,7 +168,9 @@ func TestNewConfig_InvalidFailureFormat(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	source, err := c.GetFailureTarget("testAppName", "0.0.0")
 	assert.Nil(source)
@@ -173,7 +187,9 @@ func TestNewConfig_InvalidStatsReceiver(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	source, err := c.GetObserver(map[string]string{})
 	assert.Nil(source)
@@ -186,7 +202,9 @@ func TestNewConfig_GetTags(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	tags, err := c.GetTags()
 	assert.NotNil(tags)
@@ -208,7 +226,9 @@ func TestNewConfig_Hcl_invalids(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	t.Run("invalid_transformation", func(t *testing.T) {
 		transformation, err := c.GetTransformations()
@@ -241,7 +261,9 @@ func TestNewConfig_Hcl_defaults(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	assert.Equal(c.Data.Source.Use.Name, "stdin")
 	assert.Equal(c.Data.Target.Use.Name, "stdout")
@@ -251,7 +273,7 @@ func TestNewConfig_Hcl_defaults(t *testing.T) {
 	assert.Equal(c.Data.Sentry.Debug, false)
 	assert.Equal(c.Data.StatsReceiver.TimeoutSec, 1)
 	assert.Equal(c.Data.StatsReceiver.BufferSec, 15)
-	assert.Equal(c.Data.Transformation, "none")
+	assert.Equal(c.Data.Transform.Transformation, "none")
 	assert.Equal(c.Data.LogLevel, "info")
 }
 
@@ -263,7 +285,9 @@ func TestNewConfig_Hcl_sentry(t *testing.T) {
 
 	c, err := NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	assert.Equal(c.Data.Sentry.Debug, true)
 	assert.Equal(c.Data.Sentry.Tags, "{\"testKey\":\"testValue\"}")
diff --git a/pkg/source/kinesis/kinesis_source_test.go b/pkg/source/kinesis/kinesis_source_test.go
index 340ab930..ea32c011 100644
--- a/pkg/source/kinesis/kinesis_source_test.go
+++ b/pkg/source/kinesis/kinesis_source_test.go
@@ -190,7 +190,9 @@ func TestGetSource_WithKinesisSource(t *testing.T) {
 
 	c, err := config.NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	// Use our function generator to interact with localstack
 	kinesisSourceConfigFunctionWithLocalstack := configFunctionGeneratorWithInterfaces(kinesisClient, dynamodbClient, "00000000000")
@@ -248,7 +250,9 @@ func TestKinesisSourceHCL(t *testing.T) {
 
 			c, err := config.NewConfig()
 			assert.NotNil(c)
-			assert.Nil(err)
+			if err != nil {
+				t.Fatalf("function NewConfig failed with error: %q", err.Error())
+			}
 
 			use := c.Data.Source.Use
 			decoderOpts := &config.DecoderOptions{
diff --git a/pkg/source/sourceconfig/source_config_test.go b/pkg/source/sourceconfig/source_config_test.go
index 234d91ac..3c69ad48 100644
--- a/pkg/source/sourceconfig/source_config_test.go
+++ b/pkg/source/sourceconfig/source_config_test.go
@@ -23,7 +23,9 @@ func TestNewConfig_InvalidSource(t *testing.T) {
 
 	c, err := config.NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	supportedSources := []ConfigPair{}
 
diff --git a/pkg/source/sqs/sqs_source_test.go b/pkg/source/sqs/sqs_source_test.go
index 4a55cf3e..fba5297b 100644
--- a/pkg/source/sqs/sqs_source_test.go
+++ b/pkg/source/sqs/sqs_source_test.go
@@ -119,7 +119,9 @@ func TestGetSource_WithSQSSource(t *testing.T) {
 
 	c, err := config.NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	sqsSourceConfigFunctionWithLocalStack := configFunctionGeneratorWithInterfaces(sqsClient, "00000000000")
 	adaptedHandle := adapterGenerator(sqsSourceConfigFunctionWithLocalStack)
@@ -134,7 +136,7 @@ func TestGetSource_WithSQSSource(t *testing.T) {
 	assert.IsType(&sqsSource{}, source)
 }
 
-func TestKinesisSourceHCL(t *testing.T) {
+func TestSQSSourceHCL(t *testing.T) {
 	testFixPath := "../../../config/test-fixtures"
 	testCases := []struct {
 		File     string
@@ -162,7 +164,9 @@ func TestKinesisSourceHCL(t *testing.T) {
 
 			c, err := config.NewConfig()
 			assert.NotNil(c)
-			assert.Nil(err)
+			if err != nil {
+				t.Fatalf("function NewConfig failed with error: %q", err.Error())
+			}
 
 			use := c.Data.Source.Use
 			decoderOpts := &config.DecoderOptions{
diff --git a/pkg/source/stdin/stdin_source_test.go b/pkg/source/stdin/stdin_source_test.go
index e9f01729..eeb7506e 100644
--- a/pkg/source/stdin/stdin_source_test.go
+++ b/pkg/source/stdin/stdin_source_test.go
@@ -70,7 +70,9 @@ func TestGetSource_WithStdinSource(t *testing.T) {
 
 	c, err := config.NewConfig()
 	assert.NotNil(c)
-	assert.Nil(err)
+	if err != nil {
+		t.Fatalf("function NewConfig failed with error: %q", err.Error())
+	}
 
 	stdinSource, err := sourceconfig.GetSource(c, supportedSources)