diff --git a/pkg/extension/action_test.go b/pkg/extension/action_test.go
index cfbcaf4fbc793b968526028b80cc122f5e60afff..d714a3993ad923cb56e78a0be43589f0d035e619 100644
--- a/pkg/extension/action_test.go
+++ b/pkg/extension/action_test.go
@@ -8,50 +8,47 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestActionCoversion(t *testing.T) {
-	t.Run("Protobuf", func(t *testing.T) {
-		t.Run("Should not lose information", func(t *testing.T) {
-			var pbAction *pb.Action
-			err := gofakeit.Struct(&pbAction)
-			require.NoError(t, err)
-			
-			action := ActionFromPB(pbAction)
-			result := ActionToPB(action)
-			require.Equal(t, pbAction, result)
-		})
-	
-		t.Run("Should return nil if action is nil", func(t *testing.T) {
-			var pbAction *pb.Action
-			action := ActionFromPB(pbAction)
-			result := ActionToPB(action)
-			require.Equal(t, pbAction, result)
-		})
+func TestActionToProto(t *testing.T) {
+	t.Run("Filled struct", func(t *testing.T) {
+		var pbAction *pb.Action
+		err := gofakeit.Struct(&pbAction)
+		require.NoError(t, err)
+		
+		action := ActionFromPB(pbAction)
+		result := ActionToPB(action)
+		require.Equal(t, pbAction, result)
 	})
 
-	t.Run("Map", func(t *testing.T) {
-		t.Run("Should not lose information", func(t *testing.T) {
-			var action *Action
-			err := gofakeit.Struct(&action)
-			require.NoError(t, err)
-			
-			dict := ActionToMap(action)
-			result, err := ActionFromMap(dict)
-			require.NoError(t, err)
-			require.Equal(t, action, result)
-		})
-	
-		t.Run("Should return zero-value struct if argument is nil", func(t *testing.T) {
-			var action *Action
-			dict := ActionToMap(action)
-			result, err := ActionFromMap(dict)
-			require.NoError(t, err)
-			require.Equal(t, &Action{}, result)
-		})
+	t.Run("Action is nil", func(t *testing.T) {
+		var pbAction *pb.Action
+		action := ActionFromPB(pbAction)
+		result := ActionToPB(action)
+		require.Equal(t, pbAction, result)
 	})
 }
 
-func TestActionRequestPBConversion(t *testing.T) {
-	t.Run("Should not lose information", func(t *testing.T) {
+func TestActionToMap(t *testing.T) {
+	t.Run("Filled struct", func(t *testing.T) {
+		var action *Action
+		err := gofakeit.Struct(&action)
+		require.NoError(t, err)
+		dict := ActionToMap(action)
+		result, err := ActionFromMap(dict)
+		require.NoError(t, err)
+		require.Equal(t, action, result)
+	})
+
+	t.Run("Action is nil", func(t *testing.T) {
+		var action *Action
+		dict := ActionToMap(action)
+		result, err := ActionFromMap(dict)
+		require.NoError(t, err)
+		require.Equal(t, &Action{}, result)
+	})
+}
+
+func TestActionRequestToProto(t *testing.T) {
+	t.Run("Filled struct", func(t *testing.T) {
 		var pbAction *pb.ActionRequest
 		err := gofakeit.Struct(&pbAction)
 		require.NoError(t, err)
@@ -61,7 +58,7 @@ func TestActionRequestPBConversion(t *testing.T) {
 		require.Equal(t, pbAction, result)
 	})
 
-	t.Run("Should return nil if action is nil", func(t *testing.T) {
+	t.Run("Action is nil", func(t *testing.T) {
 		var pbAction *pb.ActionRequest
 		action := ActionRequestFromPB(pbAction)
 		result := ActionRequestToPB(action)
@@ -69,18 +66,18 @@ func TestActionRequestPBConversion(t *testing.T) {
 	})
 }
 
-func TestActionResponsePBConversion(t *testing.T) {
-	t.Run("Should not lose information", func(t *testing.T) {
+func TestActionResponseToProto(t *testing.T) {
+	t.Run("Filled struct", func(t *testing.T) {
 		var pbAction *pb.ActionResponse
 		err := gofakeit.Struct(&pbAction)
 		require.NoError(t, err)
-
+	
 		action := ActionResponseFromPB(pbAction)
 		result := ActionResponseToPB(action)
 		require.Equal(t, pbAction, result)
 	})
-
-	t.Run("Should return nil if action is nil", func(t *testing.T) {
+	
+	t.Run("Action is nil", func(t *testing.T) {
 		var pbAction *pb.ActionResponse
 		action := ActionResponseFromPB(pbAction)
 		result := ActionResponseToPB(action)