diff --git a/pkg/sidecar-controller/groupsnapshot_helper.go b/pkg/sidecar-controller/groupsnapshot_helper.go
index bbe6d04b..ecf6db7b 100644
--- a/pkg/sidecar-controller/groupsnapshot_helper.go
+++ b/pkg/sidecar-controller/groupsnapshot_helper.go
@@ -426,12 +426,6 @@ func (ctrl *csiSnapshotSideCarController) createGroupSnapshotWrapper(groupSnapsh
 	// Create individual snapshots and snapshot contents
 	var snapshotContentNames []string
 	for _, snapshot := range snapshots {
-		/*
-			uuid, ok := uuidMap[snapshot.SourceVolumeId]
-			if !ok {
-				continue
-			}
-		*/
 		volumeSnapshotContentName := GetSnapshotContentNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId)
 		volumeSnapshotName := GetSnapshotNameForVolumeGroupSnapshotContent(string(groupSnapshotContent.UID), snapshot.SourceVolumeId)
 		volumeSnapshotNamespace := groupSnapshotContent.Spec.VolumeGroupSnapshotRef.Namespace
diff --git a/pkg/validation-webhook/groupsnapshot_test.go b/pkg/validation-webhook/groupsnapshot_test.go
index 4dfc214c..e1f00fe3 100644
--- a/pkg/validation-webhook/groupsnapshot_test.go
+++ b/pkg/validation-webhook/groupsnapshot_test.go
@@ -248,11 +248,16 @@ func TestAdmitVolumeGroupSnapshotV1Alpha1(t *testing.T) {
 
 func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
 	volumeHandle := "volumeHandle1"
-	modifiedField := "modified-field"
+	modifiedRefName := "modified-ref-name"
 	groupSnapshotHandle := "groupsnapshotHandle1"
+	volumeSnapshotHandles := []string{"volumeSnapshotHandle1"}
 	groupSnapshotHandles := &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
-		VolumeGroupSnapshotHandle: "volumeGroupSnapshotHandle1",
-		VolumeSnapshotHandles:     []string{"volumeSnapshotHandle1", "volumeSnapshotHandle2"},
+		VolumeGroupSnapshotHandle: groupSnapshotHandle,
+		VolumeSnapshotHandles:     volumeSnapshotHandles,
+	}
+	modifiedGroupSnapshotHandles := &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
+		VolumeGroupSnapshotHandle: groupSnapshotHandle,
+		VolumeSnapshotHandles:     append(volumeSnapshotHandles, "volumeSnapshotHandle2"),
 	}
 	volumeGroupSnapshotClassName := "volume-snapshot-class-1"
 	validContent := &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
@@ -321,7 +326,7 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
 			groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
 				Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{
 					Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{
-						VolumeGroupSnapshotHandle: &modifiedField,
+						GroupSnapshotHandles: modifiedGroupSnapshotHandles,
 					},
 					VolumeGroupSnapshotRef: core_v1.ObjectReference{
 						Name:      "snapshot-ref",
@@ -332,17 +337,20 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
 			oldGroupSnapContent: validContent,
 			shouldAdmit:         false,
 			operation:           v1.Update,
-			msg:                 fmt.Sprintf("Spec.Source.VolumeGroupSnapshotHandle is immutable but was changed from %s to %s", groupSnapshotHandle, modifiedField),
+			msg:                 fmt.Sprintf("Spec.Source.GroupSnapshotHandles is immutable but was changed from %s to %s", groupSnapshotHandles, modifiedGroupSnapshotHandles),
 		},
 		{
 			name: "Update: old is valid and new is valid but modifies immutable ref",
 			groupSnapContent: &volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContent{
 				Spec: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSpec{
 					Source: volumegroupsnapshotv1alpha1.VolumeGroupSnapshotContentSource{
-						VolumeGroupSnapshotHandle: &groupSnapshotHandle,
+						GroupSnapshotHandles: &volumegroupsnapshotv1alpha1.GroupSnapshotHandles{
+							VolumeGroupSnapshotHandle: groupSnapshotHandle,
+							VolumeSnapshotHandles:     volumeSnapshotHandles,
+						},
 					},
 					VolumeGroupSnapshotRef: core_v1.ObjectReference{
-						Name:      modifiedField,
+						Name:      modifiedRefName,
 						Namespace: "default-ns",
 					},
 				},
@@ -351,7 +359,7 @@ func TestAdmitVolumeGroupSnapshotContentV1Alpha1(t *testing.T) {
 			shouldAdmit:         false,
 			operation:           v1.Update,
 			msg: fmt.Sprintf("Spec.VolumeGroupSnapshotRef.Name is immutable but was changed from %s to %s",
-				validContent.Spec.VolumeGroupSnapshotRef.Name, modifiedField),
+				validContent.Spec.VolumeGroupSnapshotRef.Name, modifiedRefName),
 		},
 		{
 			name:                "Update: old is invalid and new is valid",